toolchain branches are now merged in main branch

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
This commit is contained in:
Wolfgang Wiedmeyer 2016-01-16 13:30:03 +01:00
parent b99f0bb259
commit b4ae23b325

View File

@ -25,7 +25,7 @@
sync-j="4" /> sync-j="4" />
<!-- BEGIN CYANOGENMOD --> <!-- BEGIN CYANOGENMOD -->
<project path="build" name="replicant_build.git" remote="fossencdi" revision="replicant-6.0-toolchain" groups="pdk" > <project path="build" name="replicant_build.git" remote="fossencdi" revision="replicant-6.0" groups="pdk" >
<copyfile src="core/root.mk" dest="Makefile" /> <copyfile src="core/root.mk" dest="Makefile" />
</project> </project>
<project path="android" name="CyanogenMod/android" /> <project path="android" name="CyanogenMod/android" />
@ -310,7 +310,7 @@
<project path="system/qcom" name="CyanogenMod/android_system_qcom" groups="qcom" /> <project path="system/qcom" name="CyanogenMod/android_system_qcom" groups="qcom" />
<project path="system/security" name="CyanogenMod/android_system_security" groups="pdk" /> <project path="system/security" name="CyanogenMod/android_system_security" groups="pdk" />
<project path="system/vold" name="CyanogenMod/android_system_vold" groups="pdk" /> <project path="system/vold" name="CyanogenMod/android_system_vold" groups="pdk" />
<project path="vendor/replicant" name="vendor_replicant.git" remote="fossencdi" revision="replicant-6.0-toolchain" /> <project path="vendor/replicant" name="vendor_replicant.git" remote="fossencdi" revision="replicant-6.0" />
<project path="vendor/cmsdk" name="CyanogenMod/cm_platform_sdk" /> <project path="vendor/cmsdk" name="CyanogenMod/cm_platform_sdk" />
<project path="vendor/qcom/opensource/dataservices" name="CyanogenMod/android_vendor_qcom_opensource_dataservices" /> <project path="vendor/qcom/opensource/dataservices" name="CyanogenMod/android_vendor_qcom_opensource_dataservices" />
<project path="vendor/qcom/opensource/dpm" name="CyanogenMod/android_vendor_qcom_opensource_dpm" /> <project path="vendor/qcom/opensource/dpm" name="CyanogenMod/android_vendor_qcom_opensource_dpm" />