Snap for 4680594 from 630f870e2d9830b91b8043b674c67f38a5701ccb to pi-release
Change-Id: I30691c9400fb5c3a70c6676e85cea4c506fe3259
diff --git a/darwin-x86/bin/header-abi-diff b/darwin-x86/bin/header-abi-diff
index 19d2cd7..7ad6715 100755
--- a/darwin-x86/bin/header-abi-diff
+++ b/darwin-x86/bin/header-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/header-abi-dumper b/darwin-x86/bin/header-abi-dumper
index 1283aa6..b34f85f 100755
--- a/darwin-x86/bin/header-abi-dumper
+++ b/darwin-x86/bin/header-abi-dumper
Binary files differ
diff --git a/darwin-x86/bin/header-abi-linker b/darwin-x86/bin/header-abi-linker
index ef0148a..70b9712 100755
--- a/darwin-x86/bin/header-abi-linker
+++ b/darwin-x86/bin/header-abi-linker
Binary files differ
diff --git a/darwin-x86/bin/merge-abi-diff b/darwin-x86/bin/merge-abi-diff
index 4db1fd8..df29e7f 100755
--- a/darwin-x86/bin/merge-abi-diff
+++ b/darwin-x86/bin/merge-abi-diff
Binary files differ
diff --git a/darwin-x86/lib64/libprotobuf-cpp-full.dylib b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
index 2d5f1f2..85aff7b 100755
--- a/darwin-x86/lib64/libprotobuf-cpp-full.dylib
+++ b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
Binary files differ
diff --git a/linux-x86/bin/header-abi-diff b/linux-x86/bin/header-abi-diff
index 8aade0f..0ccc646 100755
--- a/linux-x86/bin/header-abi-diff
+++ b/linux-x86/bin/header-abi-diff
Binary files differ
diff --git a/linux-x86/bin/header-abi-dumper b/linux-x86/bin/header-abi-dumper
index 6b934cd..cf252c0 100755
--- a/linux-x86/bin/header-abi-dumper
+++ b/linux-x86/bin/header-abi-dumper
Binary files differ
diff --git a/linux-x86/bin/header-abi-linker b/linux-x86/bin/header-abi-linker
index 216ab34..10c1660 100755
--- a/linux-x86/bin/header-abi-linker
+++ b/linux-x86/bin/header-abi-linker
Binary files differ
diff --git a/linux-x86/bin/merge-abi-diff b/linux-x86/bin/merge-abi-diff
index b92ed6c..6a71158 100755
--- a/linux-x86/bin/merge-abi-diff
+++ b/linux-x86/bin/merge-abi-diff
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index 20cbeb8..106c7ee 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index e60e040..cefb628 100755
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index c53a039..e55759d 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 d8ae847..2bf09b9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,48 +3,48 @@
<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="1d7d1eb65e25a338a18f5ccf0a71dcf9c745fbaa" upstream="master">
+ <project name="platform/build" path="build/make" revision="f3e39e5878c95e1b64413795004bd218bac9c052" upstream="master">
<linkfile dest="build/tools" src="tools" />
</project>
- <project name="platform/build/blueprint" path="build/blueprint" revision="3aaf722a8d25ed726d4aba5d96bd325afe74a61c" upstream="master" />
- <project name="platform/build/kati" path="build/kati" revision="0f3785677c3399ba61a958c3b015b632e4d1cc8f" upstream="master" />
- <project name="platform/build/soong" path="build/soong" revision="52226ad920fc848927070561a96a931157764d5b" upstream="master">
+ <project name="platform/build/blueprint" path="build/blueprint" revision="db06ccbfa9d2c9470531b96f35201fdf1d5f0256" upstream="master" />
+ <project name="platform/build/kati" path="build/kati" revision="ac70a73c816b3a51fe1541ef594f665853662e2f" upstream="master" />
+ <project name="platform/build/soong" path="build/soong" revision="b8fa197878bd27a16017b238a9ed1c3a85fcaf10" 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="0369a3b8b445bc5e5ed27e61931820a7a57d91f2" upstream="master" />
- <project clone-depth="3" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="ea86c04e26b7867af8feead65db86f7d3b929fe8" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="651f7a8136082c8e781b8051c2e2f3d9d9b9a429" upstream="master" />
+ <project clone-depth="3" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="2bab76595902ae54495ff6cd3a67f2c8b2f5e873" 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="8ffa7ffaef09617854e0f4f7586686c28342f818" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="310677b6e17986e366b708178d9b12fb916fa725" 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" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3c27c3f6c42dbb890c67820f2897812e16f01be1" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="e1b3b188ff03c41213dca621c46c39702d79f3ee" 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 -->
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="a342c52d2e5220273cbf1d3316b8fe1e4c7194ed" upstream="master" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="d9584f0d1dc650b60a764f83d39ec91c10ca8c0e" upstream="master" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
<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="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="1474fc828e6b45255fade044bbb935967657902e" upstream="master" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="a3223285a951ddaebff74a59ea17039313eb9d16" upstream="master" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" upstream="master" />
<!-- toolchain jdk prebuilts -->
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="636b6973a6918b01c5a21ff397479ab9ecea2306" upstream="master" />
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="bc70fd09a3506b4568113a9844af856219203f66" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="bb7dab15c8f2839694a4ced717ea2102e9a5b2a1" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="6573cf1d8246d83cd1ca41424605824fcc43e5cd" upstream="master" />
<!-- dependency prebuilts -->
- <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="a87160614507574b2af3fbe2c9148a7474db2397" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="779b68630a2b8d71a0e02e943c83970a77776508" upstream="master" />
<!-- dependency source -->
- <project name="platform/development" path="development" revision="86c0968a0507eeaca12cec1dfccbd4bd4c45aa77" upstream="master" />
- <project name="platform/external/clang" path="external/clang" revision="d3b33b96ca2e0318d477b65c62b2d2e8f8beaaae" upstream="master" />
- <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="12abeff10335d239f2d5aeaa638d45e2dc28565d" upstream="master" />
+ <project name="platform/development" path="development" revision="dbbae7b23b12ce6c67c3d5cf993e9091cc029820" upstream="master" />
+ <project name="platform/external/clang" path="external/clang" revision="4083c7505ffbdec9338f19e1288043efa87b9694" upstream="master" />
+ <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="754fd3d334cf667e65c9642f175326cd07922983" upstream="master" />
<project name="platform/external/googletest" path="external/googletest" revision="23f59843dbc16e86d0451123c55243c5f3fdbc33" upstream="master" />
<project name="platform/external/libcxx" path="external/libcxx" revision="02ad8ad9214145f918020b17fb9a0f0d3f86dd46" upstream="master" />
<project name="platform/external/libcxxabi" path="external/libcxxabi" revision="2eddfdfc541f691d49a425d037aa5d4f32ef22dd" upstream="master" />
<project name="platform/external/libunwind" path="external/libunwind" revision="41ba0e90f33fe3b5d1467e4fab5e0a709685c0db" upstream="master" />
<project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="9ca0ad7a15a8b9868f22f67d13fe49a2d02601dc" upstream="master" />
- <project name="platform/external/llvm" path="external/llvm" revision="3875a153ad34b20d48a22b65c9532c243bddc257" upstream="master" />
- <project name="platform/external/protobuf" path="external/protobuf" revision="a56b371c82caba91f92f8cee1ebf9aae6564ebf5" upstream="master" />
+ <project name="platform/external/llvm" path="external/llvm" revision="ebb0b5abae2699e8a2cc0f0251621fd9ee57e7a2" upstream="master" />
+ <project name="platform/external/protobuf" path="external/protobuf" revision="998f3ff954fb657b373a26a891bb310d6e3db355" upstream="master" />
<project name="platform/external/zlib" path="external/zlib" revision="0d8ec3aa938b73192a8fd69f9cd1b2568f12c4ed" upstream="master" />
<project name="platform/external/zopfli" path="external/zopfli" revision="326ac1cbe4782894dd1be564bfcab361ddd4f8f3" upstream="master" />
- <project name="platform/system/core" path="system/core" revision="0609e8d231822c6be9ab33eba3d6514525ce3ae6" upstream="master" />
+ <project name="platform/system/core" path="system/core" revision="3b353ed41cdc4156dd77c4fe8628d07455b29b7a" upstream="master" />
<!-- target projects -->
- <project name="platform/dalvik" path="dalvik" revision="6e979de7e80bdab27a9a396bb7204f0f7d475362" upstream="master" />
- <project name="platform/external/ninja" path="external/ninja" revision="495fcf4b799d84d8727ce0e185950ace29a6ea11" upstream="master" />
+ <project name="platform/dalvik" path="dalvik" revision="e803bc6c4bda3fccd23cf0eb33586363e8dc0f29" upstream="master" />
+ <project name="platform/external/ninja" path="external/ninja" revision="d62c8866d321809bb77d8337a3db5b0824ac1de0" upstream="master" />
</manifest>