Merge "Revert "Export prebuilt tools to Make""
diff --git a/common/framework/desugar.jar b/common/framework/desugar.jar
index 42402f4..dc3cfda 100644
--- a/common/framework/desugar.jar
+++ b/common/framework/desugar.jar
Binary files differ
diff --git a/common/framework/turbine.jar b/common/framework/turbine.jar
index 632fbd3..b80a8d5 100644
--- a/common/framework/turbine.jar
+++ b/common/framework/turbine.jar
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 63ca5ca..c261097 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bpfmt b/darwin-x86/bin/bpfmt
index bc8788c..186f79c 100755
--- a/darwin-x86/bin/bpfmt
+++ b/darwin-x86/bin/bpfmt
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index c142666..318ad1a 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 ab512cc..55294da 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/go_extractor b/darwin-x86/bin/go_extractor
index c97a86e..28982d0 100755
--- a/darwin-x86/bin/go_extractor
+++ b/darwin-x86/bin/go_extractor
Binary files differ
diff --git a/darwin-x86/bin/hidl-lint b/darwin-x86/bin/hidl-lint
index 5e76004..684bb57 100755
--- a/darwin-x86/bin/hidl-lint
+++ b/darwin-x86/bin/hidl-lint
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index ee4c2b5..74b2cf7 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/py2-cmd b/darwin-x86/bin/py2-cmd
index def219a..4db138e 100755
--- a/darwin-x86/bin/py2-cmd
+++ b/darwin-x86/bin/py2-cmd
Binary files differ
diff --git a/darwin-x86/bin/py3-cmd b/darwin-x86/bin/py3-cmd
index 786b437..6e15e8f 100755
--- a/darwin-x86/bin/py3-cmd
+++ b/darwin-x86/bin/py3-cmd
Binary files differ
diff --git a/darwin-x86/bin/runextractor b/darwin-x86/bin/runextractor
new file mode 100755
index 0000000..902438f
--- /dev/null
+++ b/darwin-x86/bin/runextractor
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 017b1a8..8e4b01e 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/bin/zip2zip b/darwin-x86/bin/zip2zip
index cbcbe25..1543cfd 100755
--- a/darwin-x86/bin/zip2zip
+++ b/darwin-x86/bin/zip2zip
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 24cb2e6..aa5a8b5 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 de7e114..90bcf61 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index 5939c54..e1096d4 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 9595c9f..a3e4f92 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 997d30b..50d3e5d 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 8eb782f..43768d0 100755
--- a/linux-x86/bin/bpfmt
+++ b/linux-x86/bin/bpfmt
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index db057bd..547e62b 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 463bb66..ab33f15 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/go_extractor b/linux-x86/bin/go_extractor
index dcb73d3..bf8a231 100755
--- a/linux-x86/bin/go_extractor
+++ b/linux-x86/bin/go_extractor
Binary files differ
diff --git a/linux-x86/bin/hidl-lint b/linux-x86/bin/hidl-lint
index abd8807..fa02da5 100755
--- a/linux-x86/bin/hidl-lint
+++ b/linux-x86/bin/hidl-lint
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 7c1933a..337ec88 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
index 0ee0244..0cdaa46 100755
--- a/linux-x86/bin/py2-cmd
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/runextractor b/linux-x86/bin/runextractor
new file mode 100755
index 0000000..a199f13
--- /dev/null
+++ b/linux-x86/bin/runextractor
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index a70bace..f3fe9ec 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/zip2zip b/linux-x86/bin/zip2zip
index 01b461a..231d65a 100755
--- a/linux-x86/bin/zip2zip
+++ b/linux-x86/bin/zip2zip
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index 9ea8585..88d4e76 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index d655561..9a93822 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -7,19 +7,21 @@
<project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="33462b9682d9a86f37ebd897056f28280ea0330d" />
- <project name="platform/external/ninja" path="external/ninja" revision="eaa80c85f7b74904023e1833c1b626a28e36f3dd" />
+ <project name="platform/external/ninja" path="external/ninja" revision="eb73a24d58c864a0b5b1c27e1a2458d6b666fc7b" />
- <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="572318c4b641e2aa724bc6a782efb637349d886a" />
+ <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="11ac7132403e49a9fab95a4c7cd12498e2fca8fa" />
- <project name="platform/external/icu" path="external/icu" revision="f00f35e839b1855ee82a0f46342450f0256dec3c" />
+ <project name="platform/external/icu" path="external/icu" revision="87c52d804638ad02140bd2244eda964620d65521" />
<project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c9e058c7df2bf20b0a52d10ec894593ef143c1e2" />
+ <project name="platform/external/go-cmp" path="external/go-cmp" revision="0f7c828c80e325c9fc2af078ffb108362bb84c15" />
+
<project name="platform/system/libbase" path="system/libbase" revision="52a9ea0ae76d0fadb33b18af5accbf77e8edc8c7" />
<project name="platform/external/javapoet" path="external/javapoet" revision="6c962bdd20a2b3e47d2187f0d8fc116a6acfe416" />
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="a3768c3998932745e69453925872c0aa60d4694d" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="312e25855b2fe74f31618d1ee144976ace478f70" />
<project name="platform/external/pcre" path="external/pcre" revision="393dd710385912f7bcb58373a14f9ac41898b51a" />
@@ -27,9 +29,9 @@
<project name="toolchain/make" revision="7424963d66959fdf2868ba66eff5360b0eadf2ea" />
- <project name="platform/system/core" path="system/core" revision="1688856fb3a2d5142ece787bf3928f3c7d0be107" />
+ <project name="platform/system/core" path="system/core" revision="f3a8dba1f572482570b4db9095b4fe95c393991d" />
- <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="fa69082b76bfb9e8e1725d9ec2b6cdcaed63dcc2" />
+ <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="130d1a164aa163e3d4167785f27701f8951904cf" />
<project name="platform/external/guava" path="external/guava" revision="2c1d1d5a9218adf79317f3e468492df2c12e9b24" />
@@ -45,13 +47,13 @@
<project name="platform/external/bzip2" path="external/bzip2" revision="d2e0b9e26e6a9368b85e2e908c275001f2c0a1f6" />
- <project name="platform/build/soong" path="build/soong" revision="3bb7cd98c06dd6a73f647279fe8e472068d9b761">
+ <project name="platform/build/soong" path="build/soong" revision="b648ae6bab9b99d855bc931f96fec63f8d3127cd">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
</project>
- <project name="platform/external/desugar" path="external/desugar" revision="b7882a6240e1881dcad05997bd00400c9d2d6e44" />
+ <project name="platform/external/desugar" path="external/desugar" revision="c523360cab60db2f0274e17c51ad422d8cc2936a" />
<project name="platform/external/googleapis" path="external/googleapis" revision="cf713bac0768fa14bad9fd1a537f8529fc8a7911" />
@@ -59,17 +61,17 @@
<project name="platform/external/auto" path="external/auto" revision="8d0c8f812ffa1c0ba1573e4e8c225f9ea874831d" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3affa1d2632b48f9589ab4c91ca1b825d7c73a87" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="df3c1f916d67c620149b97fc0246075ee99431d9" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="5aa32579cbaf927c3e7e9823e54ec6b36b4c9635" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="6d6841bceccd55b606e4efa405e5a00583549288" />
- <project name="platform/external/boringssl" path="external/boringssl" revision="e5486ce554dddd955e96f743e4f0858c31e60339" />
+ <project name="platform/external/boringssl" path="external/boringssl" revision="f2ac56bb021889988deefdf058377e18964ba9ea" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
<project name="platform/external/toybox" path="external/toybox" revision="edb55ced788e7d8ae7762c5f70d79c8ebf736442" />
- <project name="platform/external/golang-x-sync" path="external/golang-x-sync" revision="bf7c9e83a86ea08d93262ec468a53e866728e36a" />
+ <project name="platform/external/golang-x-sync" path="external/golang-x-sync" revision="e43247afef776e3507532a21ade3cce758b96226" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
@@ -79,22 +81,24 @@
<project name="platform/external/nsjail" path="external/nsjail" revision="a25cd900710305660a653c6b63d76286d8d6cdfe" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="5ff425fc997fa62df61fc725c893e0c42c7bb1f7" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="e6bcd7d22284b82f3c56d6be47dd8f488f2e9942" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="b616fc20ee024ace07f39b13a1f5a2bbdb67f8f7" />
<project name="platform/external/python/cpython3" path="external/python/cpython3" revision="3d79dbfa6225046f39de8060b7cfa6d944e9a414" />
- <project name="platform/build/blueprint" path="build/blueprint" revision="d2aae83b641f150a9845fb4822d36b0af46dd58f" />
+ <project name="platform/build/blueprint" path="build/blueprint" revision="08a6e802d8e0b676a54fad576d1fa1dfbca3bcc9" />
<project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" />
- <project name="platform/external/llvm" path="external/llvm" revision="ebcfbf32d5dfc8ae510f4bfee9c845e07a87179c" />
+ <project name="platform/external/llvm" path="external/llvm" revision="c74c743573d9f863f097533c05ba425d80d932ca" />
<project name="platform/external/bison" path="external/bison" revision="ef635029c745e1fb2602f5ab3fb142855532f7a5" />
<project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="9ad985049cf2f63bc507e4d7624d4812ca35fe9e" />
+ <project name="platform/external/go-subcommands" path="external/go-subcommands" revision="409adebbdb103fb745f56343d7345b57c8ea13aa" />
+
<project name="platform/external/google-java-format" path="external/google-java-format" revision="7aef6bcfd33e998e4cee84f80e0af3c16e864a94" />
<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" />
@@ -107,13 +111,13 @@
<project name="platform/external/jsoncpp" path="external/jsoncpp" revision="97aea9dc894cad247656d30cc8035790ef4ace4d" />
- <project name="platform/external/sqlite" path="external/sqlite" revision="1764d09b2ed0baded0802e4328b46a98509c4c4e" />
+ <project name="platform/external/sqlite" path="external/sqlite" revision="cb4a4f8d0c8f1cabd8ec3bffdd189f738201ae98" />
- <project name="platform/bionic" path="bionic" revision="5f080e59d27a0fd77543d5e955f4010253c05394" />
+ <project name="platform/bionic" path="bionic" revision="278992fc21f9dd2ff234afc0a2910a898ab64bc0" />
<project name="platform/external/golang-x-tools" path="external/golang-x-tools" revision="bcc6484babb4e999e4bdb6a982bfa7e92fc640d2" />
- <project name="platform/external/clang" path="external/clang" revision="bce57ce19f08e7edb7bc0aa4dd70169a4d8c3a95" />
+ <project name="platform/external/clang" path="external/clang" revision="17c5af77c496c4c9006e8062d97fbb86ea122803" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="4f5832c78e8080b207485614109d3424c8ce7662" />
@@ -121,19 +125,17 @@
<project name="platform/system/libziparchive" path="system/libziparchive" revision="287dd09a95f1dc155e54483ed73f51cd753f219b" />
- <project name="platform/external/libunwind" path="external/libunwind" revision="ea73734e976241ca3161fbae73af454763d5ce02" />
-
<project name="toolchain/m4" revision="e0fa9d57f818d550ccef84d1520923f2a942f5ba" />
<project name="platform/external/expat" path="external/expat" revision="787fb64cf910af7b63c882de42e50681a4da39e1" />
- <project name="platform/external/turbine" path="external/turbine" revision="83363de6547ee615e81d2e4e0866793fca385bb3" />
+ <project name="platform/external/turbine" path="external/turbine" revision="05d48e4dac10fd3cb3addcab40dffce9166a5d59" />
<project name="platform/external/compiler-rt" path="external/compiler-rt" revision="edbb464e3a769ef2bbb3b23ee1581d7b00529d5a" />
<project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="3b659d2aff43981eb33da7746025894cbb8fce69" />
- <project name="platform/build" path="build/make" revision="cd534e52270edd0e06af4a851bd9787160130825">
+ <project name="platform/build" path="build/make" revision="832ac1e60ff9107eab17c3b3f1b695fcecee8f56">
<linkfile dest="build/tools" src="tools" />
</project>
@@ -145,7 +147,7 @@
<project name="platform/external/selinux" path="external/selinux" revision="ace85154beb3ca91ccbdec680b193f00f83b6424" />
- <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="16cebc4b20160f9b0cf5059964bbda2b9eea72f0" />
+ <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="b7242cf1f91cd5f21cb95c484f3c466363898f88" />
<project name="platform/external/flex" path="external/flex" revision="3b24cfa05d36ee2888dccedd341a9582a53842f2" />
@@ -155,35 +157,39 @@
<project name="platform/external/zopfli" path="external/zopfli" revision="28ad37c758c52b9170f5160e227296f6224f3779" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="93ae6f8b346c5685d2460be36b332eeefd55e8f9" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="fd19930edde8d3b7c2a5f65b2bc5d2093b42e32e" />
- <project name="platform/external/kythe" path="external/kythe" revision="34fb01e47e0a7dee9e92072835d5a667ff198c0c" />
+ <project name="platform/external/kythe" path="external/kythe" revision="5535f2d757ab3bcfd7875edcf4b032a689f0ec8d" />
- <project name="platform/external/dagger2" path="external/dagger2" revision="3809f3dd127716a59f14536b19fe5cab0e0a445e" />
+ <project name="platform/external/dagger2" path="external/dagger2" revision="d28098ef83611a1578230331a4d9f6124e118054" />
- <project name="platform/build/kati" path="build/kati" revision="b9334d42d579ce8f1733ae2980208abbddabdc53" />
+ <project name="platform/build/kati" path="build/kati" revision="5fab8cf71b02d5c5c620730b245a4a0a753af46c" />
+
+ <project name="platform/external/protobuf" path="external/protobuf" revision="2263b6ef16a911acbcaf179a7c57e2857feadb9d" />
<project name="platform/external/jemalloc" path="external/jemalloc" revision="bb0dea46d7a0e8e53f193614bbf8443ee2037d80" />
- <project name="platform/development" path="development" revision="4d3d06b7a74a2d155ea7fcc743bac61e43711394" />
+ <project name="platform/development" path="development" revision="db3d12d97a7457f30408fcc5ecb378e53f2edd5e" />
<project name="platform/external/libffi" path="external/libffi" revision="18f9af9df7d4b306ae28b7ac8c79cc48263df459" />
<project name="platform/external/go-etree" path="external/go-etree" revision="7fa46d9c9eb9134443a7fc56a354f07b15fc3a76" />
+ <project name="platform/external/go-creachadair-shell" path="external/go-creachadair-shell" revision="97d772a0b6c62d6bfac71224c4fdbf896a5478ba" />
+
<project name="platform/external/fmtlib" path="external/fmtlib" revision="e05c201a33da3e172903e8dfe8bc4b3a705c4f59" />
- <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="e25b9fbfc2766e0046b1628c0a193caeec8b85a1" />
+ <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="09bf9881e620167f1cdf95184d9d2ac9afcec390" />
- <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="00cf5fc8b3ba03834214ffdc79c9700aaa1bd330" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="763afbf334092fd380d13d2349cf91a32413d415" />
<project name="platform/external/bazelbuild-remote-apis" path="external/bazelbuild-remote-apis" revision="e0e5a5351a4571f63506eec04ee49a3dd1e60327" />
- <project name="platform/external/protobuf" path="external/protobuf" revision="d70e748104efcddcb9e9b6db10fedefb11a0432a" />
+ <project name="platform/external/libunwind" path="external/libunwind" revision="ea73734e976241ca3161fbae73af454763d5ce02" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="3447ef32fa4961229942fa345c8707c7f9e00246" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="3d0e53b900fd8e721733b7d54a1acef694a47333" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="82b4e75cc6e3be2025d52ae1a17ad747ee2e6ba5" />
</manifest>