Update build-tools to ab/5015179
Fixes a kati bug around obsolete / deprecated variables used in $(call)
and ifdef.
Bug: 115687270
Test: build_test on downstream branches
Change-Id: I7830d574e32a4c7da545c0a6b8260b4d01a90f75
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index e2ec935..2192cc4 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index bf673cc..42c7469 100755
--- a/darwin-x86/bin/ckati
+++ b/darwin-x86/bin/ckati
Binary files differ
diff --git a/darwin-x86/bin/ckati_stamp_dump b/darwin-x86/bin/ckati_stamp_dump
index 717e0fb..a55c979 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 54466a2..a4f981b 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index 0ed4630..5ff9d76 100755
--- a/darwin-x86/lib64/libbase.dylib
+++ b/darwin-x86/lib64/libbase.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/acp b/linux-x86/asan/bin/acp
index f3135d6..44032f4 100755
--- a/linux-x86/asan/bin/acp
+++ b/linux-x86/asan/bin/acp
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index f4faf32..1760ed4 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index 7bc9492..625ca6f 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/makeparallel b/linux-x86/asan/bin/makeparallel
index 63d1cd4..91122df 100755
--- a/linux-x86/asan/bin/makeparallel
+++ b/linux-x86/asan/bin/makeparallel
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index 8bc4746..bc09d43 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
index 2da9626..ed54b68 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/bin/ziptime b/linux-x86/asan/bin/ziptime
index bf98869..d9e22e5 100755
--- a/linux-x86/asan/bin/ziptime
+++ b/linux-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
index cf7c32b..fe33709 100755
--- a/linux-x86/asan/lib64/libbase.so
+++ b/linux-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libc++.so b/linux-x86/asan/lib64/libc++.so
index b4e8af1..1310199 100755
--- a/linux-x86/asan/lib64/libc++.so
+++ b/linux-x86/asan/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index 59fcc97..d2719b7 100755
--- a/linux-x86/asan/lib64/liblog.so
+++ b/linux-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libz-host.so b/linux-x86/asan/lib64/libz-host.so
index c30210d..4661bc1 100755
--- a/linux-x86/asan/lib64/libz-host.so
+++ b/linux-x86/asan/lib64/libz-host.so
Binary files differ
diff --git a/linux-x86/bin/acp b/linux-x86/bin/acp
index 9c0fcd5..cdb05e3 100755
--- a/linux-x86/bin/acp
+++ b/linux-x86/bin/acp
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index be16835..e59742a 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bison b/linux-x86/bin/bison
index 4b7feb3..1f833a2 100755
--- a/linux-x86/bin/bison
+++ b/linux-x86/bin/bison
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 5b787f1..2aea5c2 100755
--- a/linux-x86/bin/ckati
+++ b/linux-x86/bin/ckati
Binary files differ
diff --git a/linux-x86/bin/ckati_stamp_dump b/linux-x86/bin/ckati_stamp_dump
index 73c3176..2d4e43e 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/flex b/linux-x86/bin/flex
index 20e4679..337e631 100755
--- a/linux-x86/bin/flex
+++ b/linux-x86/bin/flex
Binary files differ
diff --git a/linux-x86/bin/makeparallel b/linux-x86/bin/makeparallel
index a2a1329..9b5a5a9 100755
--- a/linux-x86/bin/makeparallel
+++ b/linux-x86/bin/makeparallel
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 5d2a9d4..fd9ba54 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index 76abc33..a9cd11a 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/xz b/linux-x86/bin/xz
index b29237c..080fa4f 100755
--- a/linux-x86/bin/xz
+++ b/linux-x86/bin/xz
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index 616bc52..e8b4c9b 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/bin/ziptime b/linux-x86/bin/ziptime
index 4bef0a3..96e8d7f 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index 32266f9..ee84e0e 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index ca23a3a..0343bc0 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index 4c95ecf..b62ac23 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index d0d8306..8365930 100755
--- a/linux-x86/lib64/libz-host.so
+++ b/linux-x86/lib64/libz-host.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 1bc70e8..d37b800 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,20 +3,20 @@
<remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
<default remote="aosp" revision="master" sync-j="4" />
<!-- build projects -->
- <project name="platform/build" path="build/make" revision="89e35e5ca9bbe28bf5b9db6e4c80aeb86fc62095" upstream="master">
+ <project name="platform/build" path="build/make" revision="89a9cb79e82ef81536f6bbed5f977fb6bfc1d1cc" upstream="master">
<linkfile dest="build/tools" src="tools" />
</project>
<project name="platform/build/blueprint" path="build/blueprint" revision="254f2ae7b16c654531498f37de8e7568759af816" upstream="master" />
- <project name="platform/build/kati" path="build/kati" revision="18e9d8b32b8248a6b3880a40c4236d680a2cfd96" upstream="master" />
- <project name="platform/build/soong" path="build/soong" revision="2547eaffc124a6e6187aa8ee3e93a9ded650a28b" upstream="master">
+ <project name="platform/build/kati" path="build/kati" revision="b659248e4a3b44fb88011a3d4341ef5898270358" upstream="master" />
+ <project name="platform/build/soong" path="build/soong" revision="6b3cc607f35925cebdcb49641285f228995024d6" upstream="master">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
</project>
<project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="ec9867d202a6cb31bd5424887edf9f4a71f8262f" upstream="master" />
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="0455a26f8ef61ee63df0e9a9ff1ccfbd4adb7f78" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="80f3c69f571226cd600bbab4977d821783b19a41" upstream="master" />
<!-- toolchain linux prebuilts -->
<project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="d7f936049a0e276b5a32649620f896c35e5706db" upstream="master" />
- <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="2ccb38af8c940f1feef62ff5986f4bbc5d899e66" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="9706ca5f07f14a8fbcbc57d949b641064d1566e1" upstream="master" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="f3f2eb642d1ea9ed9098223143710f240acf9197" upstream="master" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" upstream="master" />
<!-- toolchain darwin prebuilts -->
@@ -27,37 +27,37 @@
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" upstream="master" />
<!-- toolchain windows prebuilts -->
<project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c6108907886d7bb14aca2c536f0bb20dfacc6336" upstream="master" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="24285de70c617d2bd051e070598d8d4e2efb221a" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="bd5ce3905124c457953e48ca41bc463d95fe126f" upstream="master" />
<!-- toolchain jdk prebuilts -->
<project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="13f5a7554ae77bf3cd959445646ecb485a670d3a" upstream="master" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="1311527b3a3cc926a32eec58c83f89979c02c29b" upstream="master" />
<!-- dependency prebuilts -->
<project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="eb706f65dd6ca00926c484d1198888e0f1a615fb" upstream="master" />
<!-- dependency source -->
- <project name="platform/development" path="development" revision="afd0f2d831bb4f7e1f4829254081ac6895c67b76" upstream="master" />
+ <project name="platform/development" path="development" revision="e8eca8112c102b6f2e53b5bcd3963fcf243a343d" upstream="master" />
<project name="platform/external/bison" path="external/bison" revision="e16291bf844ee1ba60abd7ed28a386a1eff425d5" upstream="master" />
- <project name="platform/external/clang" path="external/clang" revision="2fce575dfef7bd3760f5882448baa32af39f0f2c" upstream="master" />
+ <project name="platform/external/clang" path="external/clang" revision="74d0fded750dbf6ba30523b101dabc01bd38b93e" upstream="master" />
<project name="platform/external/compiler-rt" path="external/compiler-rt" revision="dc737ff85f32510749ba507e289f59dec39b4a63" upstream="master" />
- <project name="platform/external/dagger2" path="external/dagger2" revision="b1654fa03e7f43425c74644ca73d860198344d30" upstream="master" />
+ <project name="platform/external/dagger2" path="external/dagger2" revision="1c404aac057009cb8ca5221ae2540364a875a3b6" upstream="master" />
<project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="f6d44b6a684316132121f4e10c6c1f532ba957b1" upstream="master" />
<project name="platform/external/flex" path="external/flex" revision="94457957c9e112dc635612b6e4fc2a64222fa995" upstream="master" />
- <project name="platform/external/googletest" path="external/googletest" revision="3971b1e06ed0ded9c2511ad2784c498371b32d03" upstream="master" />
+ <project name="platform/external/googletest" path="external/googletest" revision="ff1b400c270ffa063e55703daf3db211c20eda38" upstream="master" />
<project name="platform/external/libcxx" path="external/libcxx" revision="1c231ba2834d6924beaa0c3c70864abb5f7be1e5" upstream="master" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="3ed0b9e36d20b43c2f208e155532ba4b8f90dc86" upstream="master" />
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="f8126cddfe79c551b255a35dfbca58044dee869d" upstream="master" />
<project name="platform/external/libunwind" path="external/libunwind" revision="9ed960a358e4606d761779d772dad39cb08513dd" upstream="master" />
- <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="5a384dca2703a5cfb9198e0554f588897ce9baf8" upstream="master" />
- <project name="platform/external/llvm" path="external/llvm" revision="b1bb3bdb371c5d388000776e4c0657b2a0d5688e" upstream="master" />
+ <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="6136ec05d911d4a306778dbee9b3a49c47e421d9" upstream="master" />
+ <project name="platform/external/llvm" path="external/llvm" revision="6db9b4a01a2edc10acd3f56f7ab176a23a527a20" upstream="master" />
<project name="platform/external/protobuf" path="external/protobuf" revision="e9ab58d7c0a173e058cfd3e15f1a72a4c0c8be93" upstream="master" />
<project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" upstream="master" />
<project name="platform/external/zlib" path="external/zlib" revision="92da7cfab7f0bedad897baf57ce4d8b48b3926af" upstream="master" />
<project name="platform/external/zopfli" path="external/zopfli" revision="4101d743cef9e1161bfc9ed4d3c8d4910c6346f7" upstream="master" />
- <project name="platform/system/core" path="system/core" revision="640ceee567c7f7e3832f9de189580fd3e138e951" upstream="master" />
+ <project name="platform/system/core" path="system/core" revision="11c7f43b90fab5e2689d623d752bb68e9804a8cf" upstream="master" />
<!-- target projects -->
<project name="toolchain/go" path="toolchain/go" revision="790cd13b5a1ebd944f7b1e707bc664e5a1d1d38d" upstream="master" />
<project name="toolchain/xz" path="toolchain/xz" revision="1eba63ef29b17b43e7e2c6968207bd171b73f485" upstream="master" />
- <project name="platform/dalvik" path="dalvik" revision="dfe278c757c2700306d7f72fbeb7072110501872" upstream="master" />
- <project name="platform/external/desugar" path="external/desugar" revision="2b50d295f5acc8ddf8924cd6536dfbfe45965ade" upstream="master" />
+ <project name="platform/dalvik" path="dalvik" revision="8bc7e2e4317fe9455323a76950e47f24f9431ceb" upstream="master" />
+ <project name="platform/external/desugar" path="external/desugar" revision="89c6d053f29e60c9a460f945e83cdae7d3de4022" upstream="master" />
<project name="platform/external/ninja" path="external/ninja" revision="da8d2df755847a5ab6595a9b04bbdd71a5fc8752" upstream="master" />
<project name="platform/external/turbine" path="external/turbine" revision="bb281afdc41eda16a8277dcebdbf817c32086960" upstream="master" />
- <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="3c35e399ed4cbe58c01cf8cef18599bfac1ed15c" upstream="master" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="b77f7a55d90ca8f6724d7fbd5551b47302e9bcc1" upstream="master" />
</manifest>
