Update build-tools to ab/4458529android-o-mr1-iot-preview-6o-mr1-iot-preview-6

Adds aidl and zipalign

Bug: 69431993
Test: m
Change-Id: Ieb9e2782386c9ebb265a297ad356c7cf3299a5bb

19 files changed, 15 insertions, 9 deletions

diff --git a/common/framework/dx.jar b/common/framework/dx.jar
index 5d07e57..6864a16 100644
--- a/common/framework/dx.jar
+++ b/common/framework/dx.jar
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
new file mode 100755
index 0000000..e9385cd
--- /dev/null
+++ b/darwin-x86/bin/aidl
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 0b5fa75..6ab7ebf 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
diff --git a/darwin-x86/bin/zipalign b/darwin-x86/bin/zipalign
new file mode 100755
index 0000000..32fb16b
--- /dev/null
+++ b/darwin-x86/bin/zipalign
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
new file mode 100755
index 0000000..0147722
--- /dev/null
+++ b/darwin-x86/lib64/libbase.dylib
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
new file mode 100755
index 0000000..bf78b03
--- /dev/null
+++ b/darwin-x86/lib64/liblog.dylib
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
new file mode 100755
index 0000000..8237a16
--- /dev/null
+++ b/linux-x86/asan/bin/aidl
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
new file mode 100755
index 0000000..43f9865
--- /dev/null
+++ b/linux-x86/asan/bin/zipalign
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
new file mode 100755
index 0000000..9f5db3a
--- /dev/null
+++ b/linux-x86/asan/lib64/libbase.so
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
new file mode 100755
index 0000000..511e6eb
--- /dev/null
+++ b/linux-x86/asan/lib64/liblog.so
diff --git a/linux-x86/asan/lib64/libz-host.so b/linux-x86/asan/lib64/libz-host.so
new file mode 100755
index 0000000..a941df3
--- /dev/null
+++ b/linux-x86/asan/lib64/libz-host.so
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
new file mode 100755
index 0000000..2d9304f
--- /dev/null
+++ b/linux-x86/bin/aidl
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 0efeafa..4c18c85 100755
--- a/linux-x86/bin/bpfmt
+++ b/linux-x86/bin/bpfmt
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index 5171b2d..4ccee06 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
diff --git a/linux-x86/bin/zip2zip b/linux-x86/bin/zip2zip
index d03f845..7ee6919 100755
--- a/linux-x86/bin/zip2zip
+++ b/linux-x86/bin/zip2zip
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
new file mode 100755
index 0000000..0ad99d1
--- /dev/null
+++ b/linux-x86/bin/zipalign
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
new file mode 100755
index 0000000..cba9a56
--- /dev/null
+++ b/linux-x86/lib64/libbase.so
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
new file mode 100755
index 0000000..93b21f4
--- /dev/null
+++ b/linux-x86/lib64/liblog.so
diff --git a/manifest.xml b/manifest.xml
index e6f2c12..f5efa09 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,18 +3,18 @@
   <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="1f70f332fea350ec888d76d77ac33b290727b79e" upstream="master">
+  <project name="platform/build" path="build/make" revision="f1f66974c6da7abb8b2c5e82d77cd4150ffd2b1e" upstream="master">
     <linkfile dest="build/tools" src="tools" />
   </project>
   <project name="platform/build/blueprint" path="build/blueprint" revision="45c920172528ae33fee713eb6c962177b0a716f8" upstream="master" />
   <project name="platform/build/kati" path="build/kati" revision="330fd37d4e4fce12ceb47764879f202b527bbe00" upstream="master" />
-  <project name="platform/build/soong" path="build/soong" revision="bafc47aea6a590747cf9b7e529b4140abefc6c73" upstream="master">
+  <project name="platform/build/soong" path="build/soong" revision="6dfde48ba1dff752950144161313ad226d0e44d1" upstream="master">
     <linkfile dest="Android.bp" src="root.bp" />
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
   </project>
-  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="d516399a2758d4f666cf16128eb17589158043ad" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="52503bbc2eeeef9c969f13963a91dc5eba414b36" 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="3c267ae0ae729027da03b6c2ad0e2e90728f0ced" upstream="master" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="4e9fba639b7a5a29e957048f037b23781796161a" 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="f4efc77dafdc476d9a4f252e95b9bb1b0e1aa7ad" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="caa27bd4b435652172b6ed69d8f8f48d39e5881c" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" upstream="master" />
@@ -32,22 +32,28 @@
   <!-- dependency prebuilts -->
   <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="8acfb0b3e11d38d54bb972fb5f3dfdd0f777e2c5" upstream="master" />
   <!-- dependency source -->
-  <project name="platform/development" path="development" revision="32f6640b143b12c2fbd3b52229cfd6e60bee1aed" upstream="master" />
+  <project name="platform/development" path="development" revision="7690c7f71ec9cdca9b6f93e6c15ae1e08f81a49e" upstream="master" />
+  <project name="platform/external/bison" path="external/bison" revision="9daf3ca0930745604c1a0b790223269c48877b4b" upstream="master" />
   <project name="platform/external/clang" path="external/clang" revision="5f0db32950fe4384e131625bf668350daea079e3" upstream="master" />
   <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="260e2e68b9b12fbb1d40a573e9a6cd0c04498c7a" upstream="master" />
-  <project name="platform/external/dagger2" path="external/dagger2" revision="e5d08c40449250c30d1225ef107df7623aa5806f" upstream="master" />
+  <project name="platform/external/dagger2" path="external/dagger2" revision="8eeb4d589a6c93477abd84a4de01101651124b6a" upstream="master" />
+  <project name="platform/external/googletest" path="external/googletest" revision="6b6a5bdf2d123418d460e10ff2ab11f08406013d" upstream="master" />
   <project name="platform/external/libcxx" path="external/libcxx" revision="ba19c01cab035056f9a27459d908d73f9992f985" upstream="master" />
   <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="aa42493d878601250c3bfe1cb69875fc0b6cb7e3" upstream="master" />
   <project name="platform/external/libunwind" path="external/libunwind" revision="64403ab46fe704393e9f0f0185822eaf75aee0ed" upstream="master" />
   <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="98b55b853bbb34882b915366afe1012091b614a8" upstream="master" />
   <project name="platform/external/llvm" path="external/llvm" revision="4c2609f8188112a8aad7a287d43cc545386a84d5" upstream="master" />
   <project name="platform/external/protobuf" path="external/protobuf" revision="bcc5a4247ca6181e823dd708462e23e942dcac34" upstream="master" />
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="b9863012c0e03e1dd8a2c6d1cbd511676f93ed35" upstream="master" />
   <project name="platform/external/zlib" path="external/zlib" revision="80092b6bba524246abdaaddc5a9b77f098a10a78" upstream="master" />
+  <project name="platform/external/zopfli" path="external/zopfli" revision="7f0667c45a5289e9ce6fc07d681d356345546958" upstream="master" />
+  <project name="platform/system/core" path="system/core" revision="b7969272a3e7967b15b24fa56091b9cecea093de" upstream="master" />
   <!-- target projects -->
   <project name="toolchain/go" path="toolchain/go" revision="fea2d2393bd3da68879fa4eabd8ef663f222d037" upstream="master" />
-  <project name="platform/dalvik" path="dalvik" revision="59898630fa3ead11ecbce6a2578ffaa6447b6529" upstream="master" />
+  <project name="platform/dalvik" path="dalvik" revision="7af1e1070f5af831d340854a6c76127ea09ffadd" upstream="master" />
   <project name="platform/external/desugar" path="external/desugar" revision="bc20f321cd757023811072225e70f33e44807d2d" upstream="master" />
   <project name="platform/external/ninja" path="external/ninja" revision="495fcf4b799d84d8727ce0e185950ace29a6ea11" upstream="master" />
-  <project name="platform/external/r8" path="external/r8" revision="e7caa2eaf6d67802151310e90fa069dd44206e04" upstream="master" />
-  <project name="platform/external/turbine" path="external/turbine" revision="98b82cc095a22973eb0fd53deaac3a17362f5ac6" upstream="master" />
+  <project name="platform/external/r8" path="external/r8" revision="fdac55c253bce064163768531b6f2706db567329" upstream="master" />
+  <project name="platform/external/turbine" path="external/turbine" revision="fb25e80597b431712655a57cad6b7e91c51c19de" upstream="master" />
+  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="3a9ff7a91fa00b01a2cdb8942c60565214536b4a" upstream="master" />
 </manifest>