Merge "Update build-tools to ab/7149640"
diff --git a/common/framework/javac_extractor.jar b/common/framework/javac_extractor.jar
index 3aa9424..caab97c 100644
--- a/common/framework/javac_extractor.jar
+++ b/common/framework/javac_extractor.jar
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 97dfee9..99b60c7 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 685576a..26a717c 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 43cf835..00250e8 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 9bc3810..ff340ac 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -5,13 +5,13 @@
<default revision="build-tools-release" remote="aosp" />
- <project name="platform/build" path="build/make" revision="8835ea8fc33a377337dc2e0ff3fe912dfc93754b">
+ <project name="platform/build" path="build/make" revision="b15665101b0d182b1b74366bc2a888b91aaeec6a">
<linkfile dest="build/tools" src="tools" />
</project>
<project name="platform/build/blueprint" path="build/blueprint" revision="7bcb5cababe5339b86756711b22a71dabc0b4541" />
- <project name="platform/build/soong" path="build/soong" revision="3d43e657897365328ee941b7c133588d139e5f05">
+ <project name="platform/build/soong" path="build/soong" revision="21a0234576d28d3be495e09d75aa3ac3b91b9c28">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
@@ -19,11 +19,11 @@
<project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="8deccff4ef7a79922cd4236d7cd81dfecd7fb418" />
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="9fb4195960b82b33cc7fd62d5a399101167935bf" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="92c828212a1a8f8e1bd90d79e979644427828b21" />
- <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="33837039d46a0177fbc29579553bcf18555876f6" />
+ <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="487633bd7a0cf9fbd362cefc6c3158066c2964be" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="5355b350c54bb10bde14b1e9606c7280f53349d9" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="17176dca2f00ffe5e9a9bd464d453f5155d1ef90" />
<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="d9aafaade740ca38612c742f6d87debf362132ea" />
@@ -35,7 +35,7 @@
<project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="c0f32327a6233b9b7474cc70000f539502629002" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="0a54919558c4f93d0ac8beff9a864c7bf3519bfa" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
@@ -45,7 +45,7 @@
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="3c549b0d72457aaca650f9b6081efabd98293231" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="6dda0c72ee07d27e98910665793e6f46a2879694" />
<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="0567772fc56a29c781934dd67d430ffc38d8d73d" />
@@ -61,19 +61,19 @@
<project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="d18c42f200cf687f3df458de796268fe7c7cf5cd" />
- <project name="platform/bionic" path="bionic" revision="3a1c1f7c48d7f7f4a672eb28de42d3c49a2cfa2f" />
+ <project name="platform/bionic" path="bionic" revision="002a7b824c7bab1d4eda82b768153928a1de1e5a" />
- <project name="platform/development" path="development" revision="4b80504aa45f54635085f68b5d5705b1348db364" />
+ <project name="platform/development" path="development" revision="2645eeb51e46c5f008c7d1084230bb4ec9391186" />
<project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="f2eccaab723a34f695a9c1d82b1a75073a34ddaa" />
- <project name="platform/external/auto" path="external/auto" revision="c788b8996aff634970708cd5e149c95722c67b49" />
+ <project name="platform/external/auto" path="external/auto" revision="91a06ccfbb5817824f6f2960d980050c0124169d" />
- <project name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="fd30bf9a4b179e3206c3f3d2c8e54e4b15bd3866" />
+ <project name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="707459ddd69778dce334efcc1da37bf215ba32c3" />
<project name="platform/external/bazelbuild-remote-apis" path="external/bazelbuild-remote-apis" revision="e0e5a5351a4571f63506eec04ee49a3dd1e60327" />
- <project name="platform/external/boringssl" path="external/boringssl" revision="5286a329810436fe323f743155a1bdf06fcbfa32" />
+ <project name="platform/external/boringssl" path="external/boringssl" revision="1e60ae996f4004c4e9a7410d645e4fad0c50c75f" />
<project name="platform/external/capstone" path="external/capstone" revision="a0886973da70b44e5707bb8c20420707046ac877" />
@@ -83,13 +83,13 @@
<project name="platform/external/dagger2" path="external/dagger2" revision="127fc25647bb3d0082ebf9bd5539975f03f1d706" />
- <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="2c386e73c03b24e0a1ae27b314c7269299f5227b" />
+ <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="e2611a23ab6122d8852ddc925cce89bd48cb164f" />
<project name="platform/external/escapevelocity" path="external/escapevelocity" revision="bdd875cc12e1c7f46bbeb5fea05d0fdb5d07b1dc" />
<project name="platform/external/expat" path="external/expat" revision="4e28b878c4ab281a8931bf728d01d96feb338b7f" />
- <project name="platform/external/fmtlib" path="external/fmtlib" revision="4c96ef1743bb42362739d984e71bfe5505c777ee" />
+ <project name="platform/external/fmtlib" path="external/fmtlib" revision="df4a821467ee762b3e8393ef7c95ecac38701970" />
<project name="platform/external/go-cmp" path="external/go-cmp" revision="0f7c828c80e325c9fc2af078ffb108362bb84c15" />
@@ -111,23 +111,23 @@
<project name="platform/external/googletest" path="external/googletest" revision="e1f35040857fe3112cac00c299fe01842a422b19" />
- <project name="platform/external/guava" path="external/guava" revision="bee38a1aee119cad4801d0ca2f8eaec9560e7b9a" />
+ <project name="platform/external/guava" path="external/guava" revision="90dbffd514d583ebe5576cc9011d1196378ac361" />
- <project name="platform/external/icu" path="external/icu" revision="c5dc2f20c617f8aba8bf18f899f7469b7f05e8c9" />
+ <project name="platform/external/icu" path="external/icu" revision="d6ab27d13caf3416421f8702ec544d842f516d30" />
<project name="platform/external/javapoet" path="external/javapoet" revision="137745472179f2170a58ec914cdad78921fc7679" />
- <project name="platform/external/jemalloc" path="external/jemalloc" revision="0c83f48fb28ecc5d4946396865dba43d583e792d" />
+ <project name="platform/external/jemalloc" path="external/jemalloc" revision="477ab2ab69a95eeee2f177ad55f6b0740225ff8d" />
<project name="platform/external/jsoncpp" path="external/jsoncpp" revision="03436c0deb0308086089d98e8fac79f5fdc04806" />
- <project name="platform/external/jsr305" path="external/jsr305" revision="1a3f97731c0ce0cabb2afaf7fa4690bf4391cd6a" />
+ <project name="platform/external/jsr305" path="external/jsr305" revision="85262669cff00a45a6030251baa2f1720482e202" />
- <project name="platform/external/kythe" path="external/kythe" revision="de7e2fbaab0f29c2a69db22df15d48b72aad8180" />
+ <project name="platform/external/kythe" path="external/kythe" revision="7ed57024269865c35369a21b8d59ede94ae37c10" />
<project name="platform/external/libcxx" path="external/libcxx" revision="7a70fca0dacae7efbcd3329c7f828e0735aa092e" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="fd8f32ef796b635d666a89c0da8688e05ae27e4a" />
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="29d5d878949c1abd2c5ceb24926e382af43c2336" />
<project name="platform/external/libffi" path="external/libffi" revision="02a76e2ceb2f5e46f0e3c8d473b9618e60fa0f9b" />
@@ -137,7 +137,7 @@
<project name="platform/external/llvm" path="external/llvm" revision="fea7a439296839204ac87aeb96c6072ef58df73b" />
- <project name="platform/external/pcre" path="external/pcre" revision="562bd8cec0877100592737615b8b9b68604bdfa2" />
+ <project name="platform/external/pcre" path="external/pcre" revision="bae585cbd52ea7dacc28fbbc58eeb3aa0fd0e6e7" />
<project name="platform/external/protobuf" path="external/protobuf" revision="8458fbf27212485626d5a711ecf7edf8bbc90d75" />
@@ -145,13 +145,13 @@
<project name="platform/external/selinux" path="external/selinux" revision="cd571784a4d456e3b87aa10d7e177fe4fc696f20" />
- <project name="platform/external/sqlite" path="external/sqlite" revision="4a579c323a0521ab897d34934da043955d0c6b7a" />
+ <project name="platform/external/sqlite" path="external/sqlite" revision="9dd2c211a3453328f416ffe4f0c21cf8552a1a14" />
<project name="platform/external/zlib" path="external/zlib" revision="1549beb3fa818cc3a00d3a26d9de08444d3c9436" />
<project name="platform/external/zopfli" path="external/zopfli" revision="a95764f765a033adb07f74c618b3931f3c190e40" />
- <project name="platform/system/core" path="system/core" revision="4990b7d8783fda237c911d57fd108e25e89aa48e" />
+ <project name="platform/system/core" path="system/core" revision="7123aeedde32df931d355c58ec3d55eb6f418454" />
<project name="platform/system/libbase" path="system/libbase" revision="b532ab42c34694585b6a57e1c3d94a386ac5eea7" />
@@ -161,7 +161,7 @@
<project name="platform/system/logging" path="system/logging" revision="0e7d6ee25c993a1e6bc8596ec7471477ba58f47a" />
- <project name="platform/system/unwinding" path="system/unwinding" revision="b68bfd4094b5c0138346b8766a73014b72be6b95" />
+ <project name="platform/system/unwinding" path="system/unwinding" revision="cc7f91683ba26ea904266704b53b76fbd75c578f" />
<project name="platform/build/kati" path="build/kati" revision="4be94c95165808c449496e75d912427ff4b72745" />
@@ -175,7 +175,7 @@
<project name="platform/external/bzip2" path="external/bzip2" revision="99a97d87ff4fda6efb304a75d954998af7ea87b0" />
- <project name="platform/external/desugar" path="external/desugar" revision="cae6456e4100b910b90d020e167b99b455f3f0e8" />
+ <project name="platform/external/desugar" path="external/desugar" revision="98820177b01773b67625760c45f126e82d769b2e" />
<project name="platform/external/flex" path="external/flex" revision="e058c910354051d00ffa40f58df150a105fd31cb" />
@@ -193,11 +193,11 @@
<project name="platform/external/toybox" path="external/toybox" revision="d6e304126d7824ec4acafc8f77da5eb4c858fe26" />
- <project name="platform/external/turbine" path="external/turbine" revision="bf096fd0b66c4b2863c71bbb11b6de4c5e88806d" />
+ <project name="platform/external/turbine" path="external/turbine" revision="82cd6031a3065d15b6509d80a651758a8807e114" />
- <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="c2dfb947d81ba369d91a42d685ad1e794a32b6ed" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="5e5142668be50379de841413f5590092c54e3b7e" />
- <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="40cb34d1590b0bf6113ea17d6871c2aada9b1262" />
+ <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="039a146caaf1a0c584d0c0c7dd2feb0591793d9a" />
<project name="toolchain/go" revision="e30168b96922b220e97fbdaee6ed44c86de4ec21" />