diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-28 21:19:20 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-28 21:19:20 +0100 |
| commit | ed0947aedb476a77c7d817ec7ff44b46c1581331 (patch) | |
| tree | e861b5cfa37fc1d05c8ee49f0f226d093ee66daa | |
| parent | 7c66a92e28bd34b9181e3c13bb2a756f3c442db8 (diff) | |
| parent | 1c9fcf1ded1b8ab2dc4d394f86093a9b36773168 (diff) | |
| download | manifest-ed0947aedb476a77c7d817ec7ff44b46c1581331.tar.gz manifest-ed0947aedb476a77c7d817ec7ff44b46c1581331.tar.bz2 manifest-ed0947aedb476a77c7d817ec7ff44b46c1581331.zip | |
Merge remote-tracking branch 'origin/replicant-6.0-toolchain' into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | default.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/default.xml b/default.xml index c40d5e6..07f0b50 100644 --- a/default.xml +++ b/default.xml @@ -124,6 +124,7 @@ <project path="external/tinyalsa" name="CyanogenMod/android_external_tinyalsa" groups="pdk" /> <project path="external/tinycompress" name="CyanogenMod/android_external_tinycompress" groups="pdk" /> <project path="external/tinyxml2" name="CyanogenMod/android_external_tinyxml2" groups="pdk" /> + <project path="external/uicommon" name="CyanogenMod/android_external_cyanogen_UICommon" /> <project path="external/unrar" name="CyanogenMod/android_external_unrar" /> <project path="external/unzip" name="CyanogenMod/android_external_unzip" /> <project path="external/vim" name="CyanogenMod/android_external_vim" /> @@ -362,7 +363,6 @@ <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="aosp" /> <project path="external/droiddriver" name="platform/external/droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/easymock" name="platform/external/easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> - <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/eigen" name="platform/external/eigen" groups="pdk" remote="aosp" /> <project path="external/embunit" name="platform/external/embunit" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> @@ -528,23 +528,23 @@ <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="notdefault,pdk,linux,arm" clone-depth="1" remote="aosp" /> <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" groups="notdefault,pdk,linux,mips" clone-depth="1" remote="aosp" /> <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" groups="notdefault,pdk,linux,x86" clone-depth="1" remote="aosp" /> - <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" /> + <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" /> <project path="prebuilts/libs/libedit" name="platform/prebuilts/libs/libedit" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" /> - <project path="prebuilts/maven_repo/android" name="platform/prebuilts/maven_repo/android" groups="pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" /> - <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" clone-depth="1" remote="aosp" /> - <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk" clone-depth="1" remote="aosp" /> + <project path="prebuilts/maven_repo/android" name="platform/prebuilts/maven_repo/android" groups="notdefault,pdk-cw-fs,pdk-fs" clone-depth="1" remote="aosp" /> + <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="notdefault,pdk" clone-depth="1" remote="aosp" /> + <project path="prebuilts/ndk" name="prebuilts_ndk.git" groups="pdk" clone-depth="1" remote="fossencdi" revision="replicant-6.0" /> <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="notdefault,pdk" clone-depth="1" remote="aosp" /> - <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" clone-depth="1" remote="aosp" /> - <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools" clone-depth="1" remote="aosp" /> - <project path="sdk" name="platform/sdk" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> + <project path="prebuilts/sdk" name="prebuilts_sdk.git" groups="pdk" clone-depth="1" remote="fossencdi" revision="replicant-6.0" /> + <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="notdefault,pdk,tools" clone-depth="1" remote="aosp" /> + <project path="sdk" name="replicant_sdk.git" groups="pdk-cw-fs,pdk-fs" remote="fossencdi" revision="replicant-6.0" /> <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" remote="aosp" /> <!-- END AOSP --> <!-- TOOLCHAIN --> <project path="toolchain/src/binutils" name="toolchain_binutils.git" remote="fossencdi" revision="master" /> <project path="toolchain/src/gcc" name="toolchain/gcc" remote="aosp" revision="master" /> -<project path="toolchain/src/jack" name="toolchain/jack" remote="aosp" revision="ub-jack-brest" /> -<project path="toolchain/src/jill" name="toolchain/jill" remote="aosp" revision="ub-jack-brest" /> +<project path="toolchain/src/jack" name="toolchain_jack.git" remote="fossencdi" revision="ub-jack-brest" /> +<project path="toolchain/src/jill" name="toolchain_jill.git" remote="fossencdi" revision="ub-jack-brest" /> <!-- KERNEL --> <project path="kernel/samsung/smdk4412" name="kernel_samsung_smdk4412.git" remote="fossencdi" revision="replicant-6.0" /> |