Merge branch 'replicant-6.0-dev' into replicant-6.0

This commit is contained in:
Wolfgang Wiedmeyer 2017-09-10 16:34:12 +02:00
commit 2c56bebfe1
1 changed files with 18 additions and 13 deletions

View File

@ -14,7 +14,7 @@
<remote name="fdroid"
fetch="https://gitlab.com/fdroid/"
revision="refs/tags/0.2.4" />
revision="refs/tags/0.2.6" />
<remote name="private"
fetch="ssh://git@github.com" />
@ -76,6 +76,7 @@
<project path="external/fsck_msdos" name="LineageOS-mirror/android_external_fsck_msdos.git" groups="pdk-cw-fs,pdk-fs" />
<project path="external/fuse" name="LineageOS-mirror/android_external_fuse.git" />
<project path="external/gello-build" name="LineageOS-mirror/android_external_gello_build.git" />
<project path="external/giflib" name="LineageOS-mirror/android_external_giflib.git" groups="pdk,qcom_msm8x26" />
<project path="external/gmock" name="LineageOS-mirror/android_external_gmock.git"/>
<project path="external/gptfdisk" name="LineageOS-mirror/android_external_gptfdisk.git" groups="pdk-fs" />
<project path="external/gson" name="LineageOS-mirror/android_external_gson.git" />
@ -128,6 +129,7 @@
<project path="external/protobuf-c" name="LineageOS-mirror/android_external_protobuf-c.git" />
<project path="external/rsync" name="LineageOS-mirror/android_external_rsync.git" />
<project path="external/sepolicy" name="LineageOS-mirror/android_external_sepolicy.git" groups="pdk" />
<project path="external/sfntly" name="LineageOS-mirror/android_external_sfntly.git" groups="pdk,qcom_msm8x26" />
<project path="external/skia" name="LineageOS-mirror/android_external_skia.git" groups="pdk,qcom_msm8x26" />
<project path="external/sonivox" name="LineageOS-mirror/android_external_sonivox.git" groups="pdk" />
<project path="external/speex" name="LineageOS-mirror/android_external_speex.git" groups="pdk" />
@ -140,8 +142,10 @@
<project path="external/tinycompress" name="LineageOS-mirror/android_external_tinycompress.git" groups="pdk" />
<project path="external/tinyxml2" name="LineageOS-mirror/android_external_tinyxml2.git" groups="pdk" />
<project path="external/toybox" name="LineageOS-mirror/android_external_toybox.git" groups="pdk" />
<project path="external/tremolo" name="LineageOS-mirror/android_external_tremolo.git" groups="pdk" />
<project path="external/uicommon" name="LineageOS-mirror/android_external_cyanogen_UICommon.git" />
<project path="external/unzip" name="LineageOS-mirror/android_external_unzip.git" />
<project path="external/v8" name="LineageOS-mirror/android_external_v8.git" groups="pdk" />
<project path="external/vim" name="LineageOS-mirror/android_external_vim.git" />
<project path="external/vogar" name="LineageOS-mirror/android_external_vogar.git" groups="pdk" />
<project path="external/wpa_supplicant_8" name="LineageOS-mirror/android_external_wpa_supplicant_8.git" groups="pdk" />
@ -184,21 +188,17 @@
<project path="hardware/broadcom/libbt" name="LineageOS-mirror/android_hardware_broadcom_libbt.git" groups="pdk" />
<project path="hardware/broadcom/wlan" name="replicant/hardware_broadcom_wlan.git" remote="replicant" groups="pdk,broadcom_wlan" />
<project path="hardware/cyanogen" name="LineageOS-mirror/android_hardware_cyanogen.git" />
<project path="hardware/intel/common/libmix" name="LineageOS-mirror/android_hardware_intel_common_libmix.git" groups="intel" />
<project path="hardware/intel/common/libva" name="LineageOS-mirror/android_hardware_intel_common_libva.git" groups="intel" />
<project path="hardware/intel/common/libwsbm" name="LineageOS-mirror/android_hardware_intel_common_libwsbm.git" groups="intel" />
<project path="hardware/intel/common/omx-components" name="LineageOS-mirror/android_hardware_intel_common_omx-components.git" groups="intel" />
<project path="hardware/intel/img/hwcomposer" name="LineageOS-mirror/android_hardware_intel_img_hwcomposer.git" groups="intel" />
<project path="hardware/intel/img/psb_headers" name="LineageOS-mirror/android_hardware_intel_img_psb_headers.git" groups="intel" />
<project path="hardware/intel/img/psb_video" name="LineageOS-mirror/android_hardware_intel_img_psb_video.git" groups="intel" />
<project path="hardware/invensense" name="LineageOS-mirror/android_hardware_invensense.git" groups="invensense" />
<project path="hardware/libhardware" name="replicant/hardware_libhardware.git" remote="replicant" groups="pdk" />
<project path="hardware/libhardware_legacy" name="LineageOS-mirror/android_hardware_libhardware_legacy.git" groups="pdk" />
<project path="hardware/libhardware_legacy" name="replicant/hardware_libhardware_legacy.git" remote="replicant" groups="pdk" />
<include name="snippets/hal_cm_all.xml" />
<project path="hardware/samsung_slsi/exynos5" name="LineageOS-mirror/android_hardware_samsung_slsi_exynos5.git" />
<project path="hardware/ti/omap4" name="LineageOS-mirror/android_hardware_ti_omap4.git" />
<project path="hardware/ti/omap4" name="replicant/hardware_ti_omap4.git" remote="replicant" />
<project path="hardware/ti/omap4xxx" name="LineageOS-mirror/android_hardware_ti_omap4xxx.git" groups="omap4" />
<project path="hardware/ti/wlan" name="LineageOS-mirror/android_hardware_ti_wlan.git" />
<project path="hardware/ti/wpan" name="LineageOS-mirror/android_hardware_ti_wpan.git" />
<project path="libcore" name="replicant/libcore.git" remote="replicant" groups="pdk" />
<project path="libnativehelper" name="LineageOS-mirror/android_libnativehelper.git" groups="pdk" />
@ -242,7 +242,7 @@
<project path="packages/apps/Provision" name="LineageOS-mirror/android_packages_apps_Provision.git" groups="pdk-fs" />
<project path="packages/apps/Screencast" name="LineageOS-mirror/android_packages_apps_Screencast.git" />
<project path="packages/apps/Settings" name="replicant/packages_apps_Settings.git" remote="replicant" groups="pdk-fs" />
<project path="packages/apps/SetupWizard" name="LineageOS-mirror/android_packages_apps_SetupWizard.git" />
<project path="packages/apps/SetupWizard" name="replicant/packages_apps_SetupWizard.git" remote="replicant" />
<project path="packages/apps/SmartCardService" name="LineageOS-mirror/android_packages_apps_SmartCardService.git" groups="pdk-fs" />
<project path="packages/apps/Snap" name="LineageOS-mirror/android_packages_apps_Snap.git" />
<project path="packages/apps/SoundRecorder" name="LineageOS-mirror/android_packages_apps_SoundRecorder.git" groups="pdk-fs" />
@ -360,7 +360,6 @@
<project path="external/fdlibm" name="platform/external/fdlibm" groups="pdk" remote="aosp" />
<project path="external/fio" name="platform/external/fio" groups="pdk-fs" remote="aosp" />
<project path="external/fonttools" name="platform/external/fonttools" groups="pdk-fs" remote="aosp" />
<project path="external/giflib" name="platform/external/giflib" groups="pdk,qcom_msm8x26" remote="aosp" />
<project path="external/glide" name="platform/external/glide" groups="pdk-fs" remote="aosp" />
<project path="external/google-breakpad" name="platform/external/google-breakpad" groups="dragon" remote="aosp" />
<project path="external/google-fonts/carrois-gothic-sc" name="platform/external/google-fonts/carrois-gothic-sc" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@ -449,7 +448,6 @@
<project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" remote="aosp" />
<project path="external/scrypt" name="platform/external/scrypt" groups="pdk" remote="aosp" />
<project path="external/selinux" name="platform/external/selinux" groups="pdk" remote="aosp" />
<project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
<project path="external/slf4j" name="platform/external/slf4j" groups="pdk-fs" remote="aosp" />
<project path="external/smali" name="platform/external/smali" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/sonic" name="platform/external/sonic" groups="pdk" remote="aosp" />
@ -459,8 +457,6 @@
<project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" remote="aosp" />
<project path="external/tremolo" name="platform/external/tremolo" groups="pdk" remote="aosp" />
<project path="external/v8" name="platform/external/v8" groups="pdk" remote="aosp" />
<project path="external/valgrind" name="platform/external/valgrind" groups="pdk" remote="aosp" />
<project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot" remote="aosp" />
<project path="external/vixl" name="platform/external/vixl" groups="pdk" remote="aosp" />
@ -480,7 +476,6 @@
<project path="hardware/intel/common/wrs_omxil_core" name="platform/hardware/intel/common/wrs_omxil_core" groups="intel" remote="aosp" />
<project path="hardware/intel/sensors" name="platform/hardware/intel/sensors" groups="intel_sensors" remote="aosp" />
<project path="hardware/marvell/bt" name="platform/hardware/marvell/bt" groups="marvell_bt" remote="aosp" />
<project path="hardware/mediatek" name="platform/hardware/mediatek" groups="mediatek,mediatek_wear" remote="aosp" />
<project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960" remote="aosp" />
<project path="hardware/qcom/msm8994" name="platform/hardware/qcom/msm8994" groups="qcom_msm8994" remote="aosp" />
<project path="hardware/qcom/msm8x26" name="platform/hardware/qcom/msm8x26" groups="qcom_msm8x26" remote="aosp" />
@ -520,15 +515,25 @@
<!-- KERNEL -->
<project path="kernel/samsung/smdk4412" name="replicant/kernel_samsung_smdk4412.git" remote="replicant" />
<project path="kernel/samsung/tuna" name="replicant/kernel_samsung_tuna.git" remote="replicant" />
<project path="kernel/samsung/espresso10" name="replicant/kernel_samsung_espresso10.git" remote="replicant" />
<!-- DEVICE SPECIFIC -->
<project path="device/samsung/i9100" name="replicant/device_samsung_i9100.git" remote="replicant" />
<project path="device/samsung/n7000" name="replicant/device_samsung_n7000.git" remote="replicant" />
<project path="device/samsung/i9300" name="replicant/device_samsung_i9300.git" remote="replicant" />
<project path="device/samsung/i9305" name="replicant/device_samsung_i9305.git" remote="replicant" />
<project path="device/samsung/n7100" name="replicant/device_samsung_n7100.git" remote="replicant" />
<project path="device/samsung/n5100" name="replicant/device_samsung_n5100.git" remote="replicant" />
<project path="device/samsung/n5110" name="replicant/device_samsung_n5110.git" remote="replicant" />
<project path="device/samsung/maguro" name="replicant/device_samsung_maguro.git" remote="replicant" />
<project path="device/samsung/tuna" name="replicant/device_samsung_tuna.git" remote="replicant" />
<project path="device/samsung/espressowifi" name="replicant/device_samsung_espressowifi.git" remote="replicant" />
<project path="device/samsung/espresso3g" name="replicant/device_samsung_espresso3g.git" remote="replicant" />
<project path="device/samsung/galaxys2-common" name="replicant/device_samsung_galaxys2-common.git" remote="replicant" />
<project path="device/samsung/smdk4412-common" name="replicant/device_samsung_smdk4412-common.git" remote="replicant" />
<project path="device/samsung/smdk4412-qcom-common" name="LineageOS-mirror/android_device_samsung_smdk4412-qcom-common.git" />
<project path="device/samsung/kona-common" name="replicant/device_samsung_kona-common.git" remote="replicant" />
<project path="hardware/ril/samsung-ril" name="replicant/hardware_ril_samsung-ril.git" remote="replicant" />
<project path="external/libsamsung-ipc" name="replicant/external_libsamsung-ipc.git" remote="replicant" />
<project path="packages/apps/SamsungServiceMode" name="LineageOS-mirror/android_packages_apps_SamsungServiceMode.git" />