diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2016-03-02 19:23:14 +0000 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2016-03-02 19:23:14 +0000 |
| commit | 2feb2e56aad2ee88d4c43342bdd3f4c91c07a1c4 (patch) | |
| tree | ee35f2c3791e2517873a1ccd427daf06589d25f3 | |
| parent | d6917cab28f1eb4e1406345758612d97f273c06f (diff) | |
update some with some fixeslollipop
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rwxr-xr-x | build.sh | 1 | ||||
| -rw-r--r-- | liuyq-patches/liuyq.xml | 474 | ||||
| -rwxr-xr-x | sync-lollipop-linaro.sh | 2 |
3 files changed, 214 insertions, 263 deletions
@@ -9,6 +9,7 @@ variant="userdebug" #export INCLUDE_LAVA_HACK_FOR_MASTER=true #export TARGET_GCC_VERSION_EXP=5.3-linaro export WITH_DEXPREOPT=true +export INIT_BOOTCHART=true function build(){ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/ diff --git a/liuyq-patches/liuyq.xml b/liuyq-patches/liuyq.xml index 269d450..22afdbc 100644 --- a/liuyq-patches/liuyq.xml +++ b/liuyq-patches/liuyq.xml @@ -19,10 +19,7 @@ <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" /> <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.1-linaro" /> <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" /> - <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" /> - <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <!-- <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.2-linaro" /> <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.2-linaro" /> @@ -32,59 +29,85 @@ <remove-project name="linux" remote="github-hikey"/> <project path="kernel/linaro/hisilicon" name="linux" revision="android-hikey-linaro-4.1" remote="local"/> --> - <remove-project name="platform/bionic" /> - <project path="bionic" name="platform/bionic" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/system/core" /> - <project path="system/core" name="platform/system/core" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/system/vold" /> - <project path="system/vold" name="platform/system/vold" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/system/extras" /> - <project path="system/extras" name="platform/system/extras" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/build" /> - <project path="build" name="platform/build" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/art" /> - <project path="art" name="platform/art" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/compiler-rt" /> - <project path="external/compiler-rt" name="platform/external/compiler-rt" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/clang" /> - <project path="external/clang" name="platform/external/clang" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/libunwind" /> - <project path="external/libunwind" name="platform/external/libunwind" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/checkpolicy" /> - <remove-project name="platform/external/libsepol" /> - <project path="external/selinux" name="platform/external/selinux" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/sepolicy" /> - <project path="external/sepolicy" name="platform/external/sepolicy" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/libselinux" /> - <project path="external/libselinux" name="platform/external/libselinux" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/libcxx" /> - <project path="external/libcxx" name="platform/external/libcxx" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/llvm" /> - <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <!-- + <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" /> + <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" /> + <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" groups="pdk,linux" revision="refs/tags/android-6.0.1_r16"/> <project path="prebuilts/clang/darwin-x86/host/3.6" name="platform/prebuilts/clang/darwin-x86/host/3.6" revision="refs/tags/android-6.0.1_r16" groups="pdk,darwin" /> <project path="prebuilts/clang/linux-x86/host/3.6" name="platform/prebuilts/clang/linux-x86/host/3.6" revision="refs/tags/android-6.0.1_r16" groups="pdk,linux" /> - - <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" groups="pdk,linux" revision="refs/tags/android-6.0.1_r16"/> - <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="refs/tags/android-6.0.1_r16" groups="pdk,linux,arm" /> <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" /> <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="refs/tags/android-6.0.1_r16" groups="pdk,linux,arm" /> - <remove-project name="platform/packages/inputmethods/LatinIME" /> - <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> + <remove-project name="platform/prebuilts/misc" /> + <project path="prebuilts/misc" name="platform/prebuilts/misc" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/prebuilts/ndk" /> + <project path="prebuilts/ndk" name="platform/prebuilts/ndk" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/prebuilts/sdk" /> + <project path="prebuilts/sdk" name="platform/prebuilts/sdk" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + + <remove-project name="platform/abi/cpp" /> + <project path="abi/cpp" name="platform/abi/cpp" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/art" /> + <project path="art" name="platform/art" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/bionic" /> + <project path="bionic" name="platform/bionic" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/bootable/recovery" /> + <project path="bootable/recovery" name="platform/bootable/recovery" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/build" /> + <project path="build" name="platform/build" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/cts" /> + <project path="cts" name="platform/cts" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/dalvik" /> + <project path="dalvik" name="platform/dalvik" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/development" /> + <project path="development" name="platform/development" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/libcore" /> + <project path="libcore" name="platform/libcore" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/libnativehelper" /> + <project path="libnativehelper" name="platform/libnativehelper" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/core" /> + <project path="system/core" name="platform/system/core" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/extras" /> + <project path="system/extras" name="platform/system/extras" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <project path="system/gatekeeper" name="platform/system/gatekeeper" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/keymaster" /> + <project path="system/keymaster" name="platform/system/keymaster" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/media" /> + <project path="system/media" name="platform/system/media" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/netd" /> + <project path="system/netd" name="platform/system/netd" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/security" /> + <project path="system/security" name="platform/system/security" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/system/vold" /> + <project path="system/vold" name="platform/system/vold" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + + <remove-project name="platform/frameworks/av" /> + <project path="frameworks/av" name="platform/frameworks/av" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/base" /> + <project path="frameworks/base" name="platform/frameworks/base" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/frameworks/compile/mclinker" /> <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/frameworks/rs" /> - <project path="frameworks/rs" name="platform/frameworks/rs" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/frameworks/opt/net/voip" /> - <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/compile/libbcc" /> + <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/compile/slang" /> + <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/ex" /> + <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/minikin" /> + <project path="frameworks/minikin" name="platform/frameworks/minikin" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/ml" /> + <project path="frameworks/ml" name="platform/frameworks/ml" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/frameworks/native" /> + <project path="frameworks/native" name="platform/frameworks/native" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/frameworks/opt/net/ims" /> <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/opt/net/voip" /> + <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/frameworks/opt/net/wifi" /> <project path="frameworks/opt/net/wifi" name="platform/frameworks/opt/net/wifi" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/frameworks/opt/setupwizard" /> @@ -93,77 +116,51 @@ <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/frameworks/opt/vcard" /> <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/rs" /> + <project path="frameworks/rs" name="platform/frameworks/rs" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/frameworks/support" /> + <project path="frameworks/support" name="platform/frameworks/support" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/frameworks/webview" /> + <project path="frameworks/webview" name="platform/frameworks/webview" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/frameworks/wilhelm" /> + <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/vixl" /> - <project path="external/vixl" name="platform/external/vixl" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/srec" /> - <remove-project name="platform/packages/apps/VoiceDialer" /> - <remove-project name="platform/external/gtest" /> - <project path="external/gtest" name="platform/external/gtest" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <project path="external/squashfs-tools" name="platform/external/squashfs-tools" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/prebuilts/sdk" /> - <project path="prebuilts/sdk" name="platform/prebuilts/sdk" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/zlib" /> - <project path="external/zlib" name="platform/external/zlib" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/native" /> - <project path="frameworks/native" name="platform/frameworks/native" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/prebuilts/misc" /> - <project path="prebuilts/misc" name="platform/prebuilts/misc" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/bootable/recovery" /> - <project path="bootable/recovery" name="platform/bootable/recovery" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - - <remove-project name="platform/external/apache-http" /> - <project path="external/apache-http" name="platform/external/apache-http" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/base" /> - <project path="frameworks/base" name="platform/frameworks/base" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/frameworks/ex" /> - <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/libphonenumber" /> - <project path="external/libphonenumber" name="platform/external/libphonenumber" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/packages/apps/ContactsCommon" /> - <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/Bluetooth" /> + <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/Browser" /> + <project path="packages/apps/Browser" name="platform/packages/apps/Browser" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/Contacts" /> <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/wallpapers/HoloSpiral" /> - <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/wallpapers/PhaseBeam" /> - <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/ContactsCommon" /> + <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/DeskClock" /> + <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/Email" /> <project path="packages/apps/Email" name="platform/packages/apps/Email" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/UnifiedEmail" /> - <project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/Gallery2" /> <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/KeyChain" /> <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/Settings" /> - <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/PhoneCommon" /> + <remove-project name="platform/packages/apps/PackageInstaller" /> + <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/apps/QuickSearchBox" /> <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/Bluetooth" /> - <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/PackageInstaller" /> - <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/Browser" /> - <project path="packages/apps/Browser" name="platform/packages/apps/Browser" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/packages/apps/DeskClock" /> - <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/Settings" /> + <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/UnifiedEmail" /> + <project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/apps/VoiceDialer" /> + + <remove-project name="platform/packages/inputmethods/LatinIME" /> + <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> + <remove-project name="platform/packages/providers/MediaProvider" /> <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/providers/ContactsProvider" /> <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/services/Telecomm" /> <project path="packages/services/Telecomm" name="platform/packages/services/Telecomm" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/packages/services/Telephony" /> @@ -171,80 +168,129 @@ <remove-project name="platform/packages/services/Mms" /> <project path="packages/services/Mms" name="platform/packages/services/Mms" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/libpng" /> - <project path="external/libpng" name="platform/external/libpng" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/libcxxabi" /> - <project path="external/libcxxabi" name="platform/external/libcxxabi" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/av" /> - <project path="frameworks/av" name="platform/frameworks/av" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/valgrind" /> - <project path="external/valgrind" name="platform/external/valgrind" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/libnativehelper" /> - <project path="libnativehelper" name="platform/libnativehelper" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/system/media" /> - <project path="system/media" name="platform/system/media" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/protobuf" /> - <project path="external/protobuf" name="platform/external/protobuf" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/compile/libbcc" /> - <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/skia" /> - <project path="external/skia" name="platform/external/skia" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/wallpapers/HoloSpiral" /> + <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/packages/wallpapers/PhaseBeam" /> + <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/hardware/libhardware" /> <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/packages/apps/Bluetooth" /> - <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - + <remove-project name="platform/hardware/libhardware_legacy" /> + <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/hardware/ril" /> <project path="hardware/ril" name="platform/hardware/ril" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/development" /> - <project path="development" name="platform/development" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - + <remove-project name="platform/external/apache-http" /> + <project path="external/apache-http" name="platform/external/apache-http" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/bluetooth/bluedroid" /> + <project path="external/boringssl" name="platform/external/boringssl" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <project path="external/cblas" name="platform/external/cblas" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/checkpolicy" /> + <remove-project name="platform/external/clang" /> + <project path="external/clang" name="platform/external/clang" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/compiler-rt" /> + <project path="external/compiler-rt" name="platform/external/compiler-rt" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/conscrypt" /> + <project path="external/conscrypt" name="platform/external/conscrypt" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/e2fsprogs" /> + <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/eigen" /> + <project path="external/eigen" name="platform/external/eigen" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/elfutils" /> + <project path="external/elfutils" name="platform/external/elfutils" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/dhcpcd" /> + <project path="external/dhcpcd" name="platform/external/dhcpcd" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/fio" /> + <project path="external/fio" name="platform/external/fio" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/freetype" /> + <project path="external/freetype" name="platform/external/freetype" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/flac" /> + <project path="external/flac" name="platform/external/flac" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/gtest" /> + <project path="external/gtest" name="platform/external/gtest" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/external/icu" /> <project path="external/icu" name="platform/external/icu" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - + <remove-project name="platform/external/ipsec-tools" /> + <project path="external/ipsec-tools" name="platform/external/ipsec-tools" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/jemalloc" /> + <project path="external/jemalloc" name="platform/external/jemalloc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/jsoncpp" /> + <project path="external/jsoncpp" name="platform/external/jsoncpp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <project path="external/libavc" name="platform/external/libavc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/libcxx" /> + <project path="external/libcxx" name="platform/external/libcxx" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/libcxxabi" /> + <project path="external/libcxxabi" name="platform/external/libcxxabi" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/libgsm" /> + <project path="external/libgsm" name="platform/external/libgsm" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/libhevc" /> + <project path="external/libhevc" name="platform/external/libhevc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/libpcap" /> + <project path="external/libpcap" name="platform/external/libpcap" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/libphonenumber" /> + <project path="external/libphonenumber" name="platform/external/libphonenumber" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/libpng" /> + <project path="external/libpng" name="platform/external/libpng" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/libsepol" /> + <remove-project name="platform/external/libselinux" /> + <project path="external/libselinux" name="platform/external/libselinux" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/libunwind" /> + <project path="external/libunwind" name="platform/external/libunwind" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/linux-tools-perf" /> + <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/llvm" /> + <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/ltrace" /> + <project path="external/ltrace" name="platform/external/ltrace" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/mtpd" /> + <project path="external/mtpd" name="platform/external/mtpd" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/nanopb-c" /> + <project path="external/nanopb-c" name="platform/external/nanopb-c" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/okhttp" /> + <project path="external/okhttp" name="platform/external/okhttp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> <remove-project name="platform/external/openssl" /> - <project path="external/boringssl" name="platform/external/boringssl" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/support" /> - <project path="frameworks/support" name="platform/frameworks/support" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/hardware/libhardware_legacy" /> - <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/system/netd" /> - <project path="system/netd" name="platform/system/netd" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/frameworks/minikin" /> - <project path="frameworks/minikin" name="platform/frameworks/minikin" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/external/sonivox" /> - <project path="external/sonivox" name="platform/external/sonivox" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <remove-project name="platform/prebuilts/sdk" /> - <project path="prebuilts/sdk" name="platform/prebuilts/sdk" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/bluetooth/bluedroid" /> - - <remove-project name="platform/libcore" /> - <project path="libcore" name="platform/libcore" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/pdfium" /> <project path="external/pdfium" name="platform/external/pdfium" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/ppp" /> + <project path="external/ppp" name="platform/external/ppp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/protobuf" /> + <project path="external/protobuf" name="platform/external/protobuf" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/regex-re2" /> + <project path="external/regex-re2" name="platform/external/regex-re2" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <project path="external/roboto-fonts" name="platform/external/roboto-fonts" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/scrypt" /> + <project path="external/scrypt" name="platform/external/scrypt" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <project path="external/selinux" name="platform/external/selinux" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/sepolicy" /> + <project path="external/sepolicy" name="platform/external/sepolicy" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/sfntly" /> + <project path="external/sfntly" name="platform/external/sfntly" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/skia" /> + <project path="external/skia" name="platform/external/skia" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <project path="external/sonic" name="platform/external/sonic" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/sonivox" /> + <project path="external/sonivox" name="platform/external/sonivox" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <project path="external/squashfs-tools" name="platform/external/squashfs-tools" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/srec" /> + <remove-project name="platform/external/stlport" /> + <remove-project name="platform/external/strace" /> + <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <project path="external/toybox" name="platform/external/toybox" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <project path="external/v8" name="platform/external/v8" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> + <remove-project name="platform/external/valgrind" /> + <project path="external/valgrind" name="platform/external/valgrind" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/vixl" /> + <project path="external/vixl" name="platform/external/vixl" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> + <remove-project name="platform/external/webp" /> + <project path="external/webp" name="platform/external/webp" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> + <remove-project name="platform/external/webrtc" /> + <project path="external/webrtc" name="platform/external/webrtc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/zlib" /> + <project path="external/zlib" name="platform/external/zlib" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <remove-project name="platform/external/chromium_org" /> <remove-project name="platform/external/chromium_org/sdch/open-vcdiff" /> <remove-project name="platform/external/chromium_org/testing/gtest" /> - <remove-project name="platform/external/chromium_org/third_party/WebKit" /> <remove-project name="platform/external/chromium_org/third_party/angle" /> <remove-project name="platform/external/chromium_org/third_party/boringssl/src" /> <remove-project name="platform/external/chromium_org/third_party/brotli/src" /> @@ -265,98 +311,24 @@ <remove-project name="platform/external/chromium_org/third_party/opus/src" /> <remove-project name="platform/external/chromium_org/third_party/ots" /> <remove-project name="platform/external/chromium_org/third_party/sfntly/cpp/src" /> - <remove-project name="platform/external/chromium_org/third_party/skia" /> <remove-project name="platform/external/chromium_org/third_party/smhasher/src" /> + <remove-project name="platform/external/chromium_org/third_party/skia" /> <remove-project name="platform/external/chromium_org/third_party/usrsctp/usrsctplib" /> <remove-project name="platform/external/chromium_org/third_party/webrtc" /> + <remove-project name="platform/external/chromium_org/third_party/WebKit" /> <remove-project name="platform/external/chromium_org/third_party/yasm/source/patched-yasm" /> <remove-project name="platform/external/chromium_org/tools/grit" /> <remove-project name="platform/external/chromium_org/tools/gyp" /> <remove-project name="platform/external/chromium_org/v8" /> <remove-project name="platform/external/chromium-libpac" /> - <remove-project name="platform/external/chromium-trace" /> - <project path="external/chromium-libpac" name="platform/external/chromium-libpac" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> + <remove-project name="platform/external/chromium-trace" /> <project path="external/chromium-trace" name="platform/external/chromium-trace" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> <project path="external/chromium-webview" name="platform/external/chromium-webview" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/webp" /> - <project path="external/webp" name="platform/external/webp" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> - - <remove-project name="platform/prebuilts/ndk" /> - <project path="prebuilts/ndk" name="platform/prebuilts/ndk" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - - <project path="external/v8" name="platform/external/v8" revision="refs/tags/android-6.0.1_r16" groups="pdk-fs" /> - - <project path="system/gatekeeper" name="platform/system/gatekeeper" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/frameworks/webview" /> - <project path="frameworks/webview" name="platform/frameworks/webview" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/flac" /> - <project path="external/flac" name="platform/external/flac" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/frameworks/compile/slang" /> - <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <project path="external/sonic" name="platform/external/sonic" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/dhcpcd" /> - <project path="external/dhcpcd" name="platform/external/dhcpcd" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/frameworks/wilhelm" /> - <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/system/security" /> - <project path="system/security" name="platform/system/security" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/conscrypt" /> - <project path="external/conscrypt" name="platform/external/conscrypt" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/scrypt" /> - <project path="external/scrypt" name="platform/external/scrypt" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/system/keymaster" /> - <project path="system/keymaster" name="platform/system/keymaster" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <project path="external/roboto-fonts" name="platform/external/roboto-fonts" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/libpcap" /> - <project path="external/libpcap" name="platform/external/libpcap" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/e2fsprogs" /> - <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/mtpd" /> - <project path="external/mtpd" name="platform/external/mtpd" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/ppp" /> - <project path="external/ppp" name="platform/external/ppp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <project path="external/cblas" name="platform/external/cblas" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/eigen" /> - <project path="external/eigen" name="platform/external/eigen" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/nanopb-c" /> - <project path="external/nanopb-c" name="platform/external/nanopb-c" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/ipsec-tools" /> - <project path="external/ipsec-tools" name="platform/external/ipsec-tools" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/libgsm" /> - <project path="external/libgsm" name="platform/external/libgsm" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/abi/cpp" /> - <project path="abi/cpp" name="platform/abi/cpp" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <project path="external/libavc" name="platform/external/libavc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/libhevc" /> - <project path="external/libhevc" name="platform/external/libhevc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/ltrace" /> - <project path="external/ltrace" name="platform/external/ltrace" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/fio" /> - <project path="external/fio" name="platform/external/fio" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/dalvik" /> - <project path="dalvik" name="platform/dalvik" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/webrtc" /> - <project path="external/webrtc" name="platform/external/webrtc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/linux-tools-perf" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/jemalloc" /> - <project path="external/jemalloc" name="platform/external/jemalloc" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/okhttp" /> - <project path="external/okhttp" name="platform/external/okhttp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/strace" /> - <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> + <remove-project name="platform/external/busybox" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro-marshmallow" remote="linaro-android" /> +--> <remove-project name="platform/external/piglit" /> <remove-project name="platform/external/waffle" /> <remove-project name="platform/external/powertop-2.0" /> @@ -367,28 +339,6 @@ <remove-project name="platform/external/linaro-android-userspace-test" /> <remove-project name="platform/external/libc-bench" /> <remove-project name="platform/external/stringbench" /> - <remove-project name="platform/external/busybox" /> - <project path="external/busybox" name="platform/external/busybox" revision="linaro-marshmallow" remote="linaro-android" /> - - <remove-project name="platform/external/freetype" /> - <project path="external/freetype" name="platform/external/freetype" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/elfutils" /> - <project path="external/elfutils" name="platform/external/elfutils" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - - <remove-project name="platform/external/stlport" /> - - <remove-project name="platform/cts" /> - <project path="cts" name="platform/cts" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> - <remove-project name="platform/external/jsoncpp" /> - <project path="external/jsoncpp" name="platform/external/jsoncpp" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/regex-re2" /> - <project path="external/regex-re2" name="platform/external/regex-re2" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/external/sfntly" /> - <project path="external/sfntly" name="platform/external/sfntly" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="platform/frameworks/ml" /> - <project path="frameworks/ml" name="platform/frameworks/ml" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <project path="external/toybox" name="platform/external/toybox" revision="refs/tags/android-6.0.1_r16" groups="pdk-cw-fs,pdk-fs" /> - <remove-project name="android-sdk/libdrm" remote="git-ti-mirror" /> <project path="external/libdrm" name="platform/external/libdrm" revision="refs/tags/android-6.0.1_r16" groups="pdk" /> @@ -398,10 +348,10 @@ <remove-project name="android-sdk/device-ti-proprietary-open" remote="git-ti-mirror" /> <remove-project name="android-sdk/kernel-omap" remote="git-ti-mirror" /> +<!-- <remove-project name="android/device/linaro/juno" remote="linaro-android" /> <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm" /> -<!-- +--> <remove-project name="landing-teams/working/arm/kernel-release" remote="linaro-other" /> <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="765aceb3d8a55df16901a5e0da1f7c988bf562b3" remote="linaro-other" groups="arm" /> ---> </manifest> diff --git a/sync-lollipop-linaro.sh b/sync-lollipop-linaro.sh index ce72fb6..d483847 100755 --- a/sync-lollipop-linaro.sh +++ b/sync-lollipop-linaro.sh @@ -18,7 +18,7 @@ ${BASE}/sync-projects.sh build \ system/core \ frameworks/base \ -#./android-patchsets/LOLLIPOP-STABLE-PATCHSET +./android-patchsets/LOLLIPOP-STABLE-PATCHSET #./android-patchsets//LOLLIPOP-CHROMIUM-PATCHSET ## apply temporary patches |