Merge r-mpr-2022-01-05
Change-Id: I9362449410acebd92a52771ed0fd7aecc78424ce
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 2f90908..5a25dff 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/hidl-lint b/darwin-x86/bin/hidl-lint
index eb8f2a5..35266f1 100755
--- a/darwin-x86/bin/hidl-lint
+++ b/darwin-x86/bin/hidl-lint
Binary files differ
diff --git a/darwin-x86/bin/py3-cmd b/darwin-x86/bin/py3-cmd
index 1fa01d3..6bb5fa6 100755
--- a/darwin-x86/bin/py3-cmd
+++ b/darwin-x86/bin/py3-cmd
Binary files differ
diff --git a/darwin-x86/bin/toybox b/darwin-x86/bin/toybox
index 1f583f3..a5809bd 100755
--- a/darwin-x86/bin/toybox
+++ b/darwin-x86/bin/toybox
Binary files differ
diff --git a/darwin-x86/bin/xz b/darwin-x86/bin/xz
index 213a771..211989e 100755
--- a/darwin-x86/bin/xz
+++ b/darwin-x86/bin/xz
Binary files differ
diff --git a/darwin-x86/lib64/libcutils.dylib b/darwin-x86/lib64/libcutils.dylib
index 865df61..e182680 100755
--- a/darwin-x86/lib64/libcutils.dylib
+++ b/darwin-x86/lib64/libcutils.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 13390bd..a0a2954 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/toybox b/linux-x86/asan/bin/toybox
index d445585..e2c54ff 100755
--- a/linux-x86/asan/bin/toybox
+++ b/linux-x86/asan/bin/toybox
Binary files differ
diff --git a/linux-x86/asan/lib64/libcutils.so b/linux-x86/asan/lib64/libcutils.so
index e532e54..273fe48 100755
--- a/linux-x86/asan/lib64/libcutils.so
+++ b/linux-x86/asan/lib64/libcutils.so
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 56bd375..ce4c14b 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/hidl-lint b/linux-x86/bin/hidl-lint
index 10b882e..1dc3841 100755
--- a/linux-x86/bin/hidl-lint
+++ b/linux-x86/bin/hidl-lint
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
index bb5167e..1d32b5c 100755
--- a/linux-x86/bin/py2-cmd
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/toybox b/linux-x86/bin/toybox
index fa0130d..d69dc85 100755
--- a/linux-x86/bin/toybox
+++ b/linux-x86/bin/toybox
Binary files differ
diff --git a/linux-x86/bin/xz b/linux-x86/bin/xz
index da59e0a..f98b1c6 100755
--- a/linux-x86/bin/xz
+++ b/linux-x86/bin/xz
Binary files differ
diff --git a/linux-x86/lib64/libcutils.so b/linux-x86/lib64/libcutils.so
index a65bb34..5a82854 100755
--- a/linux-x86/lib64/libcutils.so
+++ b/linux-x86/lib64/libcutils.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index e81f68b..752a256 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -9,9 +9,29 @@
<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="4533a4d0efa68949dc3c0dfec00214feaddd6c7b" />
- <project name="platform/external/go-creachadair-stringset" path="external/go-creachadair-stringset" revision="580fe893c0cd9bc1cb41a735b6ff456901f00e83" />
+ <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="24eff379ba3ed1cb90f5f2ce8bb37c55bbd9726a" />
- <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="e183852c920ef6c36d9fd89a8c4233e98241c776" />
+ <project name="platform/external/icu" path="external/icu" revision="770befb9959f7ee67a2d272d9b4d64c69b674401" />
+
+ <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="0427eba4d10cc4f4dcbbb73e64c7e53399680087" />
+
+ <project name="platform/external/javapoet" path="external/javapoet" revision="8b674cdcc02bf4476d3a03e4437302b4fa6b202a" />
+
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="437625bc5a8c7b516499900ace5d700168099220" />
+
+ <project name="platform/external/pcre" path="external/pcre" revision="393dd710385912f7bcb58373a14f9ac41898b51a" />
+
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="bd245f589fce00483f20584aea9e74d748ed4f50" />
+
+ <project name="toolchain/make" revision="7424963d66959fdf2868ba66eff5360b0eadf2ea" />
+
+ <project name="platform/system/core" path="system/core" revision="1ef6c7966d5088bb80b6d2ed3249226b6c036534" />
+
+ <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="78640c77b8323c4c3b35964fb3818cd11fd0aaa7" />
<project name="platform/build/soong" path="build/soong" revision="1b7599d91883bfdf359e46cc0ada7278eaf8e9ed">
<linkfile dest="Android.bp" src="root.bp" />
@@ -23,13 +43,14 @@
<project name="platform/external/ninja" path="external/ninja" revision="e5a9d70b45ebecf68a8aec37edf5857b4d635c4e" />
- <project name="platform/build/blueprint" path="build/blueprint" revision="ec5085e613aefc6f3e4037823bd67d9caed804f0" />
+ <project name="toolchain/xz" revision="e953aba95e0060876d5969cc9322cf2dbb5e2cf5" />
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" />
+ <project name="toolchain/go" revision="37567209826d3740d6c44a4bf64232046f8a8cee" />
<project name="platform/external/googleapis" path="external/googleapis" revision="cf713bac0768fa14bad9fd1a537f8529fc8a7911" />
- <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="888369e69128a27f84daa478dbaff1a4bb52c423" />
+ <project name="platform/build/soong" path="build/soong" revision="18aae954ded0a5751f9aecf2aeb51a763ff4f2d4">
+ <linkfile dest="Android.bp" src="root.bp" />
<project name="platform/external/flex" path="external/flex" revision="3b24cfa05d36ee2888dccedd341a9582a53842f2" />
@@ -49,7 +70,7 @@
<project name="platform/external/zlib" path="external/zlib" revision="38881db65155e099d9ce40ad7cd634d83c4841b9" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="965a0b9300d80c4c3326c562c486159c09f16589" />
+ <project name="platform/external/toybox" path="external/toybox" revision="59e05ae805871dd70e4a683644cca9adee13ea9c" />
<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="516fb636454e34e39c2ee7729183b07194bfe7c0" />
@@ -57,7 +78,7 @@
<project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="3d0e53b900fd8e721733b7d54a1acef694a47333" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="9531f57f4a57964f84be7146f42715511e6ddec1" />
+ <project name="platform/external/jsr305" path="external/jsr305" revision="371adb839b0e5da5b4d0654577e07ea9b414cab3" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="bffdb0223ff2898246bbd14a6b17d8920ac600de" />
@@ -73,7 +94,7 @@
<project name="platform/external/boringssl" path="external/boringssl" revision="1a0ca7b15ef06d64f10184131fc5ffa50cd12746" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
+ <project name="platform/external/bison" path="external/bison" revision="094aa41974f9df9b6668db0edf1c3389cbecc9f5" />
<project name="platform/external/zopfli" path="external/zopfli" revision="7723d6077849ae5c66e105b232ddfbfc11faa09b" />
@@ -85,7 +106,7 @@
<project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="881a52803087ac26382a0eab2326234f41211826" />
- <project name="toolchain/make" revision="7424963d66959fdf2868ba66eff5360b0eadf2ea" />
+ <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="a749a4904ce469161298f24edbc27674975d4370" />
<project name="platform/external/toybox" path="external/toybox" revision="00fed19ade154fab0c0c8d5f7378a9aa46cbd26d" />
@@ -93,7 +114,7 @@
<project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="10ee074fc64acde7e1b54715053b84baae43b710" />
- <project name="platform/external/jsr305" path="external/jsr305" revision="c39448de67f76105bf4ba6d0f6ffda7a3b00ece6" />
+ <project name="platform/bionic" path="bionic" revision="45cc5cb7a651b160603bdcaedb0a078e3976ad60" />
<project name="platform/external/libunwind" path="external/libunwind" revision="b517b41431d30f54cb649fd7d2fb2422e3e849a2" />
@@ -109,27 +130,31 @@
<project name="platform/external/jemalloc" path="external/jemalloc" revision="e3ff6769f8262841c98245e21b96dc67536759dc" />
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="3447ef32fa4961229942fa345c8707c7f9e00246" />
+ <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="6c4ba9650cef32dbbd7a6651c0826ca2ac4accd1" />
- <project name="platform/external/llvm" path="external/llvm" revision="c10415f4fb599cbb121fdd4919014b4801e9e0cc" />
+ <project name="platform/external/turbine" path="external/turbine" revision="05d48e4dac10fd3cb3addcab40dffce9166a5d59" />
+
+ <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="67e81d2fc1282093fcfdbf17de70b7c44f3b8e19" />
<project name="platform/external/bc" path="external/bc" revision="63f3305c6e52ff824f08bc7ccc806e5df3d3a2a1" />
- <project name="toolchain/m4" revision="e0fa9d57f818d550ccef84d1520923f2a942f5ba" />
+ <project name="platform/build" path="build/make" revision="b6e0cb12b164296179df5e59003a3867317e2460">
+ <linkfile dest="build/tools" src="tools" />
+</project>
<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="5eb9adac16e15310335f606837915f11ccd1812e" />
+ <project name="platform/dalvik" path="dalvik" revision="ac2bf2d597e8f8b6627dd44e8f16ba25a7427265" />
<project name="platform/external/compiler-rt" path="external/compiler-rt" revision="54b43ff2d8e92841cb46f2162f4fa1489719ff27" />
- <project name="platform/external/golang-x-sync" path="external/golang-x-sync" revision="bf7c9e83a86ea08d93262ec468a53e866728e36a" />
+ <project name="platform/external/selinux" path="external/selinux" revision="d852701a014552fb2ab21358849caa062ec0ac02" />
<project name="platform/external/pcre" path="external/pcre" revision="5a8c54003e6070401460e269350bb355804eb45f" />
- <project name="platform/external/libcxx" path="external/libcxx" revision="eda4e913a505662922fc9c6f74dc8b3b12f1ed27" />
+ <project name="platform/external/flex" path="external/flex" revision="cb6da6c6418c6ccda87a2b448ba31e34bb941b2f" />
- <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="3cbae8d4e0140abbfa0e120567ef1d5b24b3f8d2" />
+ <project name="platform/external/googletest" path="external/googletest" revision="59b038ebd775fbd17386e0c8796e177e222bdaa6" />
<project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="98d90944b3ef000dd6716c57a480f52a6726749d" />
@@ -149,7 +174,7 @@
<project name="platform/external/bison" path="external/bison" revision="ef635029c745e1fb2602f5ab3fb142855532f7a5" />
- <project name="platform/external/bazelbuild-remote-apis" path="external/bazelbuild-remote-apis" revision="e0e5a5351a4571f63506eec04ee49a3dd1e60327" />
+ <project name="platform/development" path="development" revision="e06517b936d39a5ca4f9a83c00400007e03e4e16" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="9180130e429b04b8105011e7b7b64676b10abc23" />
@@ -159,9 +184,9 @@
<project name="toolchain/xz" revision="ac90d9b11e02bd6837917f7e981ed40dc2cb7d1b" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
+ <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="d811517df945be32a1403229816722daa683dbc3" />
- <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="8cc21e2906ed803de4c90eb58e52a150d4f15404" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="0f900eadc7b3ebb461f7accd4fc74bbd8f2c87cb" />
<project name="platform/external/python/cpython2" path="external/python/cpython2" revision="edba983036eab94d6c8eb211198f5ae5a874b7b0" />