Merge changes Iad2d6bb9,I4b9add35,I42317345 am: b80d209289 am: 7d1b679848 am: 343f787ec2
Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2016822
Change-Id: I53f892585715c7423f929ad53d5b71f0b9097b3d
diff --git a/Android.bp b/Android.bp
index e161310..ba028aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,9 +122,12 @@
stl: "none",
notice: "common/py3-stdlib/NOTICE",
target: {
- linux_glibc_x86_64: {
+ glibc_x86_64: {
srcs: ["linux-x86/bin/py3-launcher64"]
},
+ musl_x86_64: {
+ srcs: ["linux_musl-x86/bin/py3-launcher64"]
+ },
darwin_x86_64: {
srcs: ["darwin-x86/bin/py3-launcher64"],
},
@@ -140,6 +143,28 @@
}
cpython3_cc_prebuilt_binary {
+ name: "py3-launcher-static",
+ host_supported: true,
+ device_supported: false,
+ compile_multilib: "64",
+ stl: "none",
+ notice: "common/py3-stdlib/NOTICE",
+ target: {
+ musl_x86_64: {
+ srcs: ["linux_musl-x86/bin/py3-launcher-static64"]
+ },
+ },
+
+ // Use the prebuilts for most branches
+ prefer: true,
+ soong_config_variables: {
+ force_build_host: {
+ prefer: false,
+ },
+ },
+}
+
+cpython3_cc_prebuilt_binary {
name: "py3-launcher-autorun",
host_supported: true,
device_supported: false,
@@ -147,9 +172,12 @@
stl: "none",
notice: "common/py3-stdlib/NOTICE",
target: {
- linux_glibc_x86_64: {
+ glibc_x86_64: {
srcs: ["linux-x86/bin/py3-launcher-autorun64"]
},
+ musl_x86_64: {
+ srcs: ["linux_musl-x86/bin/py3-launcher-autorun64"]
+ },
darwin_x86_64: {
srcs: ["darwin-x86/bin/py3-launcher-autorun64"],
},
@@ -164,6 +192,28 @@
},
}
+cpython3_cc_prebuilt_binary {
+ name: "py3-launcher-autorun-static",
+ host_supported: true,
+ device_supported: false,
+ compile_multilib: "64",
+ stl: "none",
+ notice: "common/py3-stdlib/NOTICE",
+ target: {
+ musl_x86_64: {
+ srcs: ["linux_musl-x86/bin/py3-launcher-autorun-static64"]
+ },
+ },
+
+ // Use the prebuilts for most branches
+ prefer: true,
+ soong_config_variables: {
+ force_build_host: {
+ prefer: false,
+ },
+ },
+}
+
filegroup {
name: "py3-stdlib-prebuilt-srcs",
visibility: ["//external/python/cpython3/Lib"],
diff --git a/common/framework/turbine.jar b/common/framework/turbine.jar
index e4f77e3..97db5e1 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 56af7ee..331a669 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/one-true-awk b/darwin-x86/bin/one-true-awk
index 3bcbefa..b9d1990 100755
--- a/darwin-x86/bin/one-true-awk
+++ b/darwin-x86/bin/one-true-awk
Binary files differ
diff --git a/darwin-x86/bin/py2-cmd b/darwin-x86/bin/py2-cmd
index 21bb384..c98dbe2 100755
--- a/darwin-x86/bin/py2-cmd
+++ b/darwin-x86/bin/py2-cmd
Binary files differ
diff --git a/darwin-x86/lib64/libsqlite.dylib b/darwin-x86/lib64/libsqlite.dylib
index 3e273f9..f52abce 100755
--- a/darwin-x86/lib64/libsqlite.dylib
+++ b/darwin-x86/lib64/libsqlite.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 0677c61..64b8a50 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
index 4d108d4..da4db9d 100755
--- a/linux-x86/asan/lib64/libbase.so
+++ b/linux-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libcrypto-host.so b/linux-x86/asan/lib64/libcrypto-host.so
index 6b84df4..f8c4e41 100755
--- a/linux-x86/asan/lib64/libcrypto-host.so
+++ b/linux-x86/asan/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 86b447e..4ace17e 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bloaty b/linux-x86/bin/bloaty
index 1fc38bc..1c2cb05 100755
--- a/linux-x86/bin/bloaty
+++ b/linux-x86/bin/bloaty
Binary files differ
diff --git a/linux-x86/bin/hidl-gen b/linux-x86/bin/hidl-gen
index 5acbd6c..d7cbc66 100755
--- a/linux-x86/bin/hidl-gen
+++ b/linux-x86/bin/hidl-gen
Binary files differ
diff --git a/linux-x86/bin/hidl-lint b/linux-x86/bin/hidl-lint
index 8b32d87..dc5f6fc 100755
--- a/linux-x86/bin/hidl-lint
+++ b/linux-x86/bin/hidl-lint
Binary files differ
diff --git a/linux-x86/bin/one-true-awk b/linux-x86/bin/one-true-awk
index 853c349..c8c546b 100755
--- a/linux-x86/bin/one-true-awk
+++ b/linux-x86/bin/one-true-awk
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
index 8dfe139..c625eb5 100755
--- a/linux-x86/bin/py2-cmd
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/ziptool b/linux-x86/bin/ziptool
index 0034211..169b8bf 100755
--- a/linux-x86/bin/ziptool
+++ b/linux-x86/bin/ziptool
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index a81fa45..d4529e2 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libcrypto-host.so b/linux-x86/lib64/libcrypto-host.so
index 17b9d3e..cc60f1a 100755
--- a/linux-x86/lib64/libcrypto-host.so
+++ b/linux-x86/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/lib64/libnl.so b/linux-x86/lib64/libnl.so
index 576d364..4df2a47 100755
--- a/linux-x86/lib64/libnl.so
+++ b/linux-x86/lib64/libnl.so
Binary files differ
diff --git a/linux-x86/lib64/libsqlite.so b/linux-x86/lib64/libsqlite.so
index 442b359..7db8697 100755
--- a/linux-x86/lib64/libsqlite.so
+++ b/linux-x86/lib64/libsqlite.so
Binary files differ
diff --git a/linux-x86/lib64/libziparchive.so b/linux-x86/lib64/libziparchive.so
index 8f9735c..aca2b7b 100755
--- a/linux-x86/lib64/libziparchive.so
+++ b/linux-x86/lib64/libziparchive.so
Binary files differ
diff --git a/linux_musl-x86/asan/bin/acp b/linux_musl-x86/asan/bin/acp
new file mode 100755
index 0000000..3366d1f
--- /dev/null
+++ b/linux_musl-x86/asan/bin/acp
Binary files differ
diff --git a/linux_musl-x86/asan/bin/aidl b/linux_musl-x86/asan/bin/aidl
new file mode 100755
index 0000000..64b8a50
--- /dev/null
+++ b/linux_musl-x86/asan/bin/aidl
Binary files differ
diff --git a/linux_musl-x86/asan/bin/ckati b/linux_musl-x86/asan/bin/ckati
new file mode 100755
index 0000000..03dc93b
--- /dev/null
+++ b/linux_musl-x86/asan/bin/ckati
Binary files differ
diff --git a/linux_musl-x86/asan/bin/gavinhoward-bc b/linux_musl-x86/asan/bin/gavinhoward-bc
new file mode 100755
index 0000000..79a20eb
--- /dev/null
+++ b/linux_musl-x86/asan/bin/gavinhoward-bc
Binary files differ
diff --git a/linux_musl-x86/asan/bin/ninja b/linux_musl-x86/asan/bin/ninja
new file mode 100755
index 0000000..fd27185
--- /dev/null
+++ b/linux_musl-x86/asan/bin/ninja
Binary files differ
diff --git a/linux_musl-x86/asan/bin/toybox b/linux_musl-x86/asan/bin/toybox
new file mode 100755
index 0000000..323370a
--- /dev/null
+++ b/linux_musl-x86/asan/bin/toybox
Binary files differ
diff --git a/linux_musl-x86/asan/bin/zipalign b/linux_musl-x86/asan/bin/zipalign
new file mode 100755
index 0000000..acf3d57
--- /dev/null
+++ b/linux_musl-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux_musl-x86/asan/bin/ziptime b/linux_musl-x86/asan/bin/ziptime
new file mode 100755
index 0000000..02cdffa
--- /dev/null
+++ b/linux_musl-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux_musl-x86/asan/bin/ziptool b/linux_musl-x86/asan/bin/ziptool
new file mode 100755
index 0000000..d8be5b0
--- /dev/null
+++ b/linux_musl-x86/asan/bin/ziptool
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libbase.so b/linux_musl-x86/asan/lib64/libbase.so
new file mode 100755
index 0000000..da4db9d
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libc++.so b/linux_musl-x86/asan/lib64/libc++.so
new file mode 100755
index 0000000..22e34db
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libc++.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libcrypto-host.so b/linux_musl-x86/asan/lib64/libcrypto-host.so
new file mode 100755
index 0000000..f8c4e41
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libjemalloc5.so b/linux_musl-x86/asan/lib64/libjemalloc5.so
new file mode 100755
index 0000000..2dd72d8
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libjemalloc5.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/liblog.so b/linux_musl-x86/asan/lib64/liblog.so
new file mode 100755
index 0000000..ff93721
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libz-host.so b/linux_musl-x86/asan/lib64/libz-host.so
new file mode 100755
index 0000000..3881406
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libz-host.so
Binary files differ
diff --git a/linux_musl-x86/asan/lib64/libziparchive.so b/linux_musl-x86/asan/lib64/libziparchive.so
new file mode 100755
index 0000000..0ebb85c
--- /dev/null
+++ b/linux_musl-x86/asan/lib64/libziparchive.so
Binary files differ
diff --git a/linux_musl-x86/bin/acp b/linux_musl-x86/bin/acp
new file mode 100755
index 0000000..59ea459
--- /dev/null
+++ b/linux_musl-x86/bin/acp
Binary files differ
diff --git a/linux_musl-x86/bin/aidl b/linux_musl-x86/bin/aidl
new file mode 100755
index 0000000..25fd8d6
--- /dev/null
+++ b/linux_musl-x86/bin/aidl
Binary files differ
diff --git a/linux_musl-x86/bin/bison b/linux_musl-x86/bin/bison
new file mode 100755
index 0000000..a86b84c
--- /dev/null
+++ b/linux_musl-x86/bin/bison
Binary files differ
diff --git a/linux_musl-x86/bin/bloaty b/linux_musl-x86/bin/bloaty
new file mode 100755
index 0000000..cbcc70d
--- /dev/null
+++ b/linux_musl-x86/bin/bloaty
Binary files differ
diff --git a/linux_musl-x86/bin/bpfmt b/linux_musl-x86/bin/bpfmt
new file mode 100755
index 0000000..d3e58e7
--- /dev/null
+++ b/linux_musl-x86/bin/bpfmt
Binary files differ
diff --git a/linux_musl-x86/bin/bssl_inject_hash b/linux_musl-x86/bin/bssl_inject_hash
new file mode 100755
index 0000000..436b7f5
--- /dev/null
+++ b/linux_musl-x86/bin/bssl_inject_hash
Binary files differ
diff --git a/linux_musl-x86/bin/bzip2 b/linux_musl-x86/bin/bzip2
new file mode 100755
index 0000000..6f24cbd
--- /dev/null
+++ b/linux_musl-x86/bin/bzip2
Binary files differ
diff --git a/linux_musl-x86/bin/ckati b/linux_musl-x86/bin/ckati
new file mode 100755
index 0000000..e09bf25
--- /dev/null
+++ b/linux_musl-x86/bin/ckati
Binary files differ
diff --git a/linux_musl-x86/bin/ckati_stamp_dump b/linux_musl-x86/bin/ckati_stamp_dump
new file mode 100755
index 0000000..f59bb1c
--- /dev/null
+++ b/linux_musl-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux_musl-x86/bin/create_minidebuginfo b/linux_musl-x86/bin/create_minidebuginfo
new file mode 100755
index 0000000..2687185
--- /dev/null
+++ b/linux_musl-x86/bin/create_minidebuginfo
Binary files differ
diff --git a/linux_musl-x86/bin/flex b/linux_musl-x86/bin/flex
new file mode 100755
index 0000000..9effa62
--- /dev/null
+++ b/linux_musl-x86/bin/flex
Binary files differ
diff --git a/linux_musl-x86/bin/gavinhoward-bc b/linux_musl-x86/bin/gavinhoward-bc
new file mode 100755
index 0000000..aaf8803
--- /dev/null
+++ b/linux_musl-x86/bin/gavinhoward-bc
Binary files differ
diff --git a/linux_musl-x86/bin/go_extractor b/linux_musl-x86/bin/go_extractor
new file mode 100755
index 0000000..e2d6fa4
--- /dev/null
+++ b/linux_musl-x86/bin/go_extractor
Binary files differ
diff --git a/linux_musl-x86/bin/hidl-gen b/linux_musl-x86/bin/hidl-gen
new file mode 100755
index 0000000..6f14a6e
--- /dev/null
+++ b/linux_musl-x86/bin/hidl-gen
Binary files differ
diff --git a/linux_musl-x86/bin/hidl-lint b/linux_musl-x86/bin/hidl-lint
new file mode 100755
index 0000000..3762247
--- /dev/null
+++ b/linux_musl-x86/bin/hidl-lint
Binary files differ
diff --git a/linux_musl-x86/bin/m4 b/linux_musl-x86/bin/m4
new file mode 100755
index 0000000..7cad0eb
--- /dev/null
+++ b/linux_musl-x86/bin/m4
Binary files differ
diff --git a/linux_musl-x86/bin/make b/linux_musl-x86/bin/make
new file mode 100755
index 0000000..d6e60d6
--- /dev/null
+++ b/linux_musl-x86/bin/make
Binary files differ
diff --git a/linux_musl-x86/bin/ninja b/linux_musl-x86/bin/ninja
new file mode 100755
index 0000000..59d2ccf
--- /dev/null
+++ b/linux_musl-x86/bin/ninja
Binary files differ
diff --git a/linux_musl-x86/bin/nsjail b/linux_musl-x86/bin/nsjail
new file mode 100755
index 0000000..2fceca2
--- /dev/null
+++ b/linux_musl-x86/bin/nsjail
Binary files differ
diff --git a/linux_musl-x86/bin/one-true-awk b/linux_musl-x86/bin/one-true-awk
new file mode 100755
index 0000000..90a39d8
--- /dev/null
+++ b/linux_musl-x86/bin/one-true-awk
Binary files differ
diff --git a/linux_musl-x86/bin/openssl b/linux_musl-x86/bin/openssl
new file mode 100755
index 0000000..efd8157
--- /dev/null
+++ b/linux_musl-x86/bin/openssl
Binary files differ
diff --git a/linux_musl-x86/bin/py2-cmd b/linux_musl-x86/bin/py2-cmd
new file mode 100755
index 0000000..262f8a4
--- /dev/null
+++ b/linux_musl-x86/bin/py2-cmd
Binary files differ
diff --git a/linux_musl-x86/bin/py3-cmd b/linux_musl-x86/bin/py3-cmd
new file mode 100755
index 0000000..982c41e
--- /dev/null
+++ b/linux_musl-x86/bin/py3-cmd
Binary files differ
diff --git a/linux_musl-x86/bin/py3-launcher-autorun-static64 b/linux_musl-x86/bin/py3-launcher-autorun-static64
new file mode 100755
index 0000000..b744124
--- /dev/null
+++ b/linux_musl-x86/bin/py3-launcher-autorun-static64
Binary files differ
diff --git a/linux_musl-x86/bin/py3-launcher-autorun64 b/linux_musl-x86/bin/py3-launcher-autorun64
new file mode 100755
index 0000000..74635d9
--- /dev/null
+++ b/linux_musl-x86/bin/py3-launcher-autorun64
Binary files differ
diff --git a/linux_musl-x86/bin/py3-launcher-static64 b/linux_musl-x86/bin/py3-launcher-static64
new file mode 100755
index 0000000..94fc036
--- /dev/null
+++ b/linux_musl-x86/bin/py3-launcher-static64
Binary files differ
diff --git a/linux_musl-x86/bin/py3-launcher64 b/linux_musl-x86/bin/py3-launcher64
new file mode 100755
index 0000000..8841d22
--- /dev/null
+++ b/linux_musl-x86/bin/py3-launcher64
Binary files differ
diff --git a/linux_musl-x86/bin/runextractor b/linux_musl-x86/bin/runextractor
new file mode 100755
index 0000000..0a706a1
--- /dev/null
+++ b/linux_musl-x86/bin/runextractor
Binary files differ
diff --git a/linux_musl-x86/bin/soong_zip b/linux_musl-x86/bin/soong_zip
new file mode 100755
index 0000000..a06409b
--- /dev/null
+++ b/linux_musl-x86/bin/soong_zip
Binary files differ
diff --git a/linux_musl-x86/bin/toybox b/linux_musl-x86/bin/toybox
new file mode 100755
index 0000000..7c55da7
--- /dev/null
+++ b/linux_musl-x86/bin/toybox
Binary files differ
diff --git a/linux_musl-x86/bin/xz b/linux_musl-x86/bin/xz
new file mode 100755
index 0000000..d4be008
--- /dev/null
+++ b/linux_musl-x86/bin/xz
Binary files differ
diff --git a/linux_musl-x86/bin/zip2zip b/linux_musl-x86/bin/zip2zip
new file mode 100755
index 0000000..a47bbea
--- /dev/null
+++ b/linux_musl-x86/bin/zip2zip
Binary files differ
diff --git a/linux_musl-x86/bin/zipalign b/linux_musl-x86/bin/zipalign
new file mode 100755
index 0000000..acd7147
--- /dev/null
+++ b/linux_musl-x86/bin/zipalign
Binary files differ
diff --git a/linux_musl-x86/bin/ziptime b/linux_musl-x86/bin/ziptime
new file mode 100755
index 0000000..b8238c4
--- /dev/null
+++ b/linux_musl-x86/bin/ziptime
Binary files differ
diff --git a/linux_musl-x86/bin/ziptool b/linux_musl-x86/bin/ziptool
new file mode 100755
index 0000000..247e902
--- /dev/null
+++ b/linux_musl-x86/bin/ziptool
Binary files differ
diff --git a/linux_musl-x86/lib64/libbase.so b/linux_musl-x86/lib64/libbase.so
new file mode 100755
index 0000000..0d700b7
--- /dev/null
+++ b/linux_musl-x86/lib64/libbase.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libc++.so b/linux_musl-x86/lib64/libc++.so
new file mode 100755
index 0000000..212292b
--- /dev/null
+++ b/linux_musl-x86/lib64/libc++.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libc_musl.so b/linux_musl-x86/lib64/libc_musl.so
new file mode 100755
index 0000000..fcf6794
--- /dev/null
+++ b/linux_musl-x86/lib64/libc_musl.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libcrypto-host.so b/linux_musl-x86/lib64/libcrypto-host.so
new file mode 100755
index 0000000..25c63f9
--- /dev/null
+++ b/linux_musl-x86/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libicui18n-host.so b/linux_musl-x86/lib64/libicui18n-host.so
new file mode 100755
index 0000000..e5938c4
--- /dev/null
+++ b/linux_musl-x86/lib64/libicui18n-host.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libicuuc-host.so b/linux_musl-x86/lib64/libicuuc-host.so
new file mode 100755
index 0000000..d954908
--- /dev/null
+++ b/linux_musl-x86/lib64/libicuuc-host.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libjemalloc5.so b/linux_musl-x86/lib64/libjemalloc5.so
new file mode 100755
index 0000000..806168d
--- /dev/null
+++ b/linux_musl-x86/lib64/libjemalloc5.so
Binary files differ
diff --git a/linux_musl-x86/lib64/liblog.so b/linux_musl-x86/lib64/liblog.so
new file mode 100755
index 0000000..34df19d
--- /dev/null
+++ b/linux_musl-x86/lib64/liblog.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libnl.so b/linux_musl-x86/lib64/libnl.so
new file mode 100755
index 0000000..648772a
--- /dev/null
+++ b/linux_musl-x86/lib64/libnl.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libprotobuf-cpp-full.so b/linux_musl-x86/lib64/libprotobuf-cpp-full.so
new file mode 100755
index 0000000..a2d1ecf
--- /dev/null
+++ b/linux_musl-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libsqlite.so b/linux_musl-x86/lib64/libsqlite.so
new file mode 100755
index 0000000..4f3d8f6
--- /dev/null
+++ b/linux_musl-x86/lib64/libsqlite.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libz-host.so b/linux_musl-x86/lib64/libz-host.so
new file mode 100755
index 0000000..013a5b2
--- /dev/null
+++ b/linux_musl-x86/lib64/libz-host.so
Binary files differ
diff --git a/linux_musl-x86/lib64/libziparchive.so b/linux_musl-x86/lib64/libziparchive.so
new file mode 100755
index 0000000..015fc25
--- /dev/null
+++ b/linux_musl-x86/lib64/libziparchive.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 34fe8b0..3a7b738 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -5,91 +5,91 @@
<default remote="aosp" revision="build-tools-release" sync-j="4" />
- <project name="platform/build" path="build/make" revision="c7d4f4727ae62b177d7291d0f764f5b2a376bef1" upstream="build-tools-release">
+ <project name="platform/build" path="build/make" revision="9a2e616934616726af3c3cc714f725497c44661c" upstream="build-tools-release">
<linkfile dest="build/tools" src="tools" />
</project>
- <project name="platform/build/blueprint" path="build/blueprint" revision="bf787a3a6192da7e3f08e5699d98b78e7b4411cd" upstream="build-tools-release" />
+ <project name="platform/build/blueprint" path="build/blueprint" revision="25473575c47592e8bad27a15d707cf511d71a21b" upstream="build-tools-release" />
- <project name="platform/build/soong" path="build/soong" revision="3e319adb3416deb1a8d06d4781664fd090511075" upstream="build-tools-release">
+ <project name="platform/build/soong" path="build/soong" revision="7083b4f071b0b5a21706c7a69b596fe90fc194b3" upstream="build-tools-release">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
</project>
- <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="e0f13d46efe3e0d964f234af25cdefc12e0c2ff2" upstream="build-tools-release" />
+ <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="1d4a1b807962dbec87fc593e68b0ed20619504ce" upstream="build-tools-release" />
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="7d1fb8626e005fd4f2064eb0fb97747338434e1b" upstream="build-tools-release" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="8e3939a896910d830849c72a4c5b77ee1eef9d27" upstream="build-tools-release" />
- <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="7e224bf167233141cf8e1dd8575a0d0c175fcf7d" upstream="build-tools-release" />
+ <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="a2ef5f7cb92192b80d2f11930d55ffc9b34d0335" upstream="build-tools-release" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="212c45b50c6813ea8800a3afa3f52e20c41e6ee0" upstream="build-tools-release" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="e2fb1e989c027b81266934bb4181bf10a6828454" upstream="build-tools-release" />
<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="7454fb3d3249c268b7e61a6551e4a17dfd031ea9" upstream="build-tools-release" />
- <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="24de6f8e428798aa7c4d336268b75dcd8fc29cc2" upstream="build-tools-release" />
+ <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="b3dee9cce205c149dd0a0bfcf47946552ce91b54" upstream="build-tools-release" />
<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="5829f985214310ebf005ae6ee52ce9742b489804" upstream="build-tools-release" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="82650f13a037e6ca3035aa9203ed7ce125807249" upstream="build-tools-release" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="46a0218abaf6e504fc9c86b56c2ef78c1ce9d5a8" upstream="build-tools-release" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="cfaa2ca50f534ec2945c2587ffa119519268efad" upstream="build-tools-release" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="468bd8f5fdc78c9fbe8bbc543cb360a3193acd2b" upstream="build-tools-release" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="04565e0c014946d763cb798018304d8d4e861d14" upstream="build-tools-release" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="build-tools-release" />
<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="0197f6709a21d106bc37587695be434bce37f7a6" upstream="build-tools-release" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="58d37191894e1be9fe39e8421b349faeaa9ba287" upstream="build-tools-release" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="de516f8491a636ae9d3815ff5d26b8d6bf83ac9c" upstream="build-tools-release" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="2433f0ca209251e67a89bbaf6c34da9fe54edeac" upstream="build-tools-release" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="86820413a0b3ea1d264ff672e47ee815ca7d9b03" upstream="build-tools-release" />
- <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="1772993705ea120e5c2f29bf63a37a6151b7d2ff" upstream="build-tools-release" />
+ <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="394eb6414b099b017e355ceae71d5bd22938c46e" upstream="build-tools-release" />
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="c9180234834a7f4c375309c969df7297564e839d" upstream="build-tools-release" />
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="38b5e4530ecd8512643431db1851374304a86b8c" upstream="build-tools-release" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" upstream="build-tools-release" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="0ff41a53c757fed33a113405c4183dc41951d9d6" upstream="build-tools-release" />
- <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="cad40b1f7dd59e569be641169e7c9c8b42b7ce44" upstream="build-tools-release" />
+ <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="acf69ef3af49f628d230a3075f861b2d624a43a8" upstream="build-tools-release" />
- <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="1eb8c4b1509ecd6b6c0513a168683e60051ce571" upstream="build-tools-release" />
+ <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="f39851bb0453058b137e3f7e3acf5318cbac51e7" upstream="build-tools-release" />
- <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="6f4eef8f12003d86a66df908a95aab18d9fcb779" upstream="build-tools-release" />
+ <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="429578fc27ff8d1a1650cb87a296b8a2f0eeb5af" upstream="build-tools-release" />
- <project name="platform/bionic" path="bionic" revision="d1c526970be21174bd7e2fa455f86c8821f2d354" upstream="build-tools-release" />
+ <project name="platform/bionic" path="bionic" revision="17b58b77f3460ad7ecaf938cc2ce7be36de127ec" upstream="build-tools-release" />
- <project name="platform/development" path="development" revision="efa51140c4772aed202dc0d944c82718b89b5403" upstream="build-tools-release" />
+ <project name="platform/development" path="development" revision="e0a7431f46397ad6868fc387bd3fabd9f5065b10" upstream="build-tools-release" />
- <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="852620871b603d5f3c4fd5995dc117a2ee75554d" upstream="build-tools-release" />
+ <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="cc43e4070024406ae206abe2b9a64d3cedaf22df" upstream="build-tools-release" />
- <project name="platform/external/auto" path="external/auto" revision="f1b1a6f08de1e196afc884188eb5ea1eaa297b58" upstream="build-tools-release" />
+ <project name="platform/external/auto" path="external/auto" revision="170de5c699347db63f181a3cd19754f7ff792404" upstream="build-tools-release" />
- <project name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="47df15ece89f347892514298baaf221666994788" upstream="build-tools-release" />
+ <project name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="db776f92317a92afc1704470903a19b8d6a70012" upstream="build-tools-release" />
- <project name="platform/external/boringssl" path="external/boringssl" revision="7ae06dad01d8452f9bb57b4c7c793425f15d35d9" upstream="build-tools-release" />
+ <project name="platform/external/boringssl" path="external/boringssl" revision="4293c7cd3685ad7efff7046ad92233e9b962b061" upstream="build-tools-release" />
- <project name="platform/external/capstone" path="external/capstone" revision="c61eef460e951ebd60440714abbf7f2e6520601d" upstream="build-tools-release" />
+ <project name="platform/external/capstone" path="external/capstone" revision="5e914c02322762f4fe923e905450d5abef318710" upstream="build-tools-release" />
- <project name="platform/external/clang" path="external/clang" revision="8fe52f210dfcd7f78dc048901096df5a90f773f2" upstream="build-tools-release" />
+ <project name="platform/external/clang" path="external/clang" revision="be37abdfb8ea04707547a223674a66f59febf687" upstream="build-tools-release" />
<project name="platform/external/compiler-rt" path="external/compiler-rt" revision="9e2d3f74317402ca8caa89403b4f371f40288884" upstream="build-tools-release" />
- <project name="platform/external/dagger2" path="external/dagger2" revision="beeb8ef36f0a32a04994bd6f1b6a7572fa748f98" upstream="build-tools-release" />
+ <project name="platform/external/dagger2" path="external/dagger2" revision="4d730ba6656d03b8447a6d0fda0c240663dbd28d" upstream="build-tools-release" />
- <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="133f1d09875d4669ed246d2bca5a18a8caa78ecc" upstream="build-tools-release" />
+ <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="1868e0e4afcd499e380350a63cc88b78c7cd0f0b" upstream="build-tools-release" />
<project name="platform/external/escapevelocity" path="external/escapevelocity" revision="e3a8bb0fae9c5f25890c84e3378e51373b52a909" upstream="build-tools-release" />
- <project name="platform/external/expat" path="external/expat" revision="a1f3d72c25f9a7a1143404f5684d3257ac061bc9" upstream="build-tools-release" />
+ <project name="platform/external/expat" path="external/expat" revision="f332090ae890a33cb1dc7c3e7077c186699aff2a" upstream="build-tools-release" />
- <project name="platform/external/fmtlib" path="external/fmtlib" revision="ac68d493ccf682259fb1b233f232485205434910" upstream="build-tools-release" />
+ <project name="platform/external/fmtlib" path="external/fmtlib" revision="d6382a2e64a7f444438ded5839b6ce02fbedd7c5" upstream="build-tools-release" />
- <project name="platform/external/go-cmp" path="external/go-cmp" revision="77d55ca89e1d06759fad74b94627d2b01e679b2c" upstream="build-tools-release" />
+ <project name="platform/external/go-cmp" path="external/go-cmp" revision="3f05150be7afae350fed0f3cf3b9ff0799bf9d3d" upstream="build-tools-release" />
<project name="platform/external/go-creachadair-shell" path="external/go-creachadair-shell" revision="bbbc3604ea8929caee86551ea0028880316c4be6" upstream="build-tools-release" />
@@ -105,87 +105,87 @@
<project name="platform/external/golang-x-tools" path="external/golang-x-tools" revision="457aa020f87e3a763226dc76aa3459fd23d0aa11" upstream="build-tools-release" />
- <project name="platform/external/google-java-format" path="external/google-java-format" revision="37042d25a66bb71da90488eb41c28352c2f9c638" upstream="build-tools-release" />
+ <project name="platform/external/google-java-format" path="external/google-java-format" revision="2e807a09ae0a6425158ce9f6dd5c973a18000c69" upstream="build-tools-release" />
- <project name="platform/external/googletest" path="external/googletest" revision="bb39c87e86221774474e8069da6a64d75269c33b" upstream="build-tools-release" />
+ <project name="platform/external/googletest" path="external/googletest" revision="23658bb9f8c596f2e2cc57082f59d117b46d123e" upstream="build-tools-release" />
- <project name="platform/external/guava" path="external/guava" revision="737d1a0aa4e967ffdc12c0448e03e69ab6e6267b" upstream="build-tools-release" />
+ <project name="platform/external/guava" path="external/guava" revision="cea8b35c5ef589dc9ceff02bc8e85f6e8b721fb9" upstream="build-tools-release" />
- <project name="platform/external/icu" path="external/icu" revision="325e17a7808d0f2c5756e93d0f1ce95b77c60831" upstream="build-tools-release" />
+ <project name="platform/external/icu" path="external/icu" revision="25c47790490e82d507bd7779b45f746f368cb0d3" upstream="build-tools-release" />
<project name="platform/external/javapoet" path="external/javapoet" revision="d274ed4f3e04713ec752625c446b9f59daaa80bb" upstream="build-tools-release" />
- <project name="platform/external/jemalloc_new" path="external/jemalloc_new" revision="c2ec187dfcb17157eb1e431dc679416a6fb076e5" upstream="build-tools-release" />
+ <project name="platform/external/jemalloc_new" path="external/jemalloc_new" revision="3d56a1d6a98851cfd9787e014725a9fd173c6594" upstream="build-tools-release" />
- <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="75792293c1b19ebbf5b3df793607101e165f9050" upstream="build-tools-release" />
+ <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="32a76503fac7218713f4b7f0efe3a7cd35b4a373" upstream="build-tools-release" />
- <project name="platform/external/jsr305" path="external/jsr305" revision="7275e66fa572b6a09b393ca53686ff881da07de4" upstream="build-tools-release" />
+ <project name="platform/external/jsr305" path="external/jsr305" revision="35925fe0d5590dc3ab64497d6c37c4871c464948" upstream="build-tools-release" />
<project name="platform/external/kythe" path="external/kythe" revision="d378bed15e1e109215e9af3b50ae0b41c234d2bb" upstream="build-tools-release" />
- <project name="platform/external/libcxx" path="external/libcxx" revision="b013187464812ddddb7748708f73a8b9597ed4e0" upstream="build-tools-release" />
+ <project name="platform/external/libcxx" path="external/libcxx" revision="70cb6f3dc3de7aefc1d85167c1da3abd63fb8bde" upstream="build-tools-release" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="bf6e0538a716a5d7c7ebff5e2f638354f53a1a2c" upstream="build-tools-release" />
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="7f64168c18f858d274d71195cb311fef7103cddf" upstream="build-tools-release" />
- <project name="platform/external/libffi" path="external/libffi" revision="0822402e529372895b51ea307a5c87a5ed36eca8" upstream="build-tools-release" />
+ <project name="platform/external/libffi" path="external/libffi" revision="26b76f3eb3e1b24928fd8b3702d4867a5e30be1f" upstream="build-tools-release" />
- <project name="platform/external/libnl" path="external/libnl" revision="d3967b456575cc07f4380dca6ec85245cc46a5fb" upstream="build-tools-release" />
+ <project name="platform/external/libnl" path="external/libnl" revision="cc1dcb0e233d877dead1b63e9891ad2c1934903b" upstream="build-tools-release" />
<project name="platform/external/libunwind" path="external/libunwind" revision="003e4832d571cacfb8ca333daa6e99c22f6bf0da" upstream="build-tools-release" />
<project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="fee7d0130129f8598b917133c890da370a74c605" upstream="build-tools-release" />
- <project name="platform/external/llvm" path="external/llvm" revision="cda57de0f5b3b7dbd71fc894ac9dd257319fa146" upstream="build-tools-release" />
+ <project name="platform/external/llvm" path="external/llvm" revision="0ba656459e375c10c44367f032d14959c6320f31" upstream="build-tools-release" />
- <project name="platform/external/lzma" path="external/lzma" revision="cbba1abda3049a875b8148eaf016fdc876702d62" upstream="build-tools-release" />
+ <project name="platform/external/lzma" path="external/lzma" revision="3e8a4d1d81b7e8e046ad1f5e79dcbe4ff839404e" upstream="build-tools-release" />
- <project name="platform/external/musl" path="external/musl" revision="1d3b620dad6055c6ab15618de1a60cdd3ec5444e" upstream="build-tools-release" />
+ <project name="platform/external/musl" path="external/musl" revision="18ee9bc2a7b68ff95c7f4d082a4caf2758107764" upstream="build-tools-release" />
- <project name="platform/external/pcre" path="external/pcre" revision="c5eaeb0e9ca4b91fb4071b5c674271d2842e9281" upstream="build-tools-release" />
+ <project name="platform/external/pcre" path="external/pcre" revision="fe81096baddfe4d58f69306f123dae70654b4af6" upstream="build-tools-release" />
- <project name="platform/external/protobuf" path="external/protobuf" revision="4f2ed50175b0f8eed20ac2dc518da7c92394fdd4" upstream="build-tools-release" />
+ <project name="platform/external/protobuf" path="external/protobuf" revision="c07588831bd88abc64dbf3b587559f017015fe40" upstream="build-tools-release" />
<project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" upstream="build-tools-release" />
- <project name="platform/external/selinux" path="external/selinux" revision="a01d18c922a836658a9f1cb1bc415531a31b2d7f" upstream="build-tools-release" />
+ <project name="platform/external/selinux" path="external/selinux" revision="1d09e9ace57c6f5b413727953e3287cee3770f2c" upstream="build-tools-release" />
- <project name="platform/external/sqlite" path="external/sqlite" revision="f0f0d3ddc79993a597b9bad9e24b933d44a69001" upstream="build-tools-release" />
+ <project name="platform/external/sqlite" path="external/sqlite" revision="b2c607eea65987af6f077f469984d371505ed47a" upstream="build-tools-release" />
<project name="platform/external/starlark-go" path="external/starlark-go" revision="dfe047847e867d4b297b4524a129e169484d8c42" upstream="build-tools-release" />
- <project name="platform/external/zlib" path="external/zlib" revision="7ca742cc965681489b6d33d237cf7e2391e7a8a0" upstream="build-tools-release" />
+ <project name="platform/external/zlib" path="external/zlib" revision="813594e30898f98ccc7bfc87b7d9819ce9665b72" upstream="build-tools-release" />
- <project name="platform/external/zopfli" path="external/zopfli" revision="8ead122d01356ba52d9673d146dd8148f811ccac" upstream="build-tools-release" />
+ <project name="platform/external/zopfli" path="external/zopfli" revision="cf3f34689a36a959d4578e82adb46532e38c2eaa" upstream="build-tools-release" />
- <project name="platform/system/core" path="system/core" revision="e42a80f4c162f0f489d91dd384a18764eb245e54" upstream="build-tools-release" />
+ <project name="platform/system/core" path="system/core" revision="59f2e118708ee19784fe7c128cff08fa7a529fba" upstream="build-tools-release" />
- <project name="platform/system/libbase" path="system/libbase" revision="d796397d4caf8f65d4f00bfc3e6d16fffd5acab0" upstream="build-tools-release" />
+ <project name="platform/system/libbase" path="system/libbase" revision="1a1ad23fe43b9604e21d12143db11f17a9718699" upstream="build-tools-release" />
- <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="a568e80166fc8a36afeb990ff4461ca51ca7fa3c" upstream="build-tools-release" />
+ <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="7209ac3db2691bb831a90aafe08c9dc1daacba60" upstream="build-tools-release" />
- <project name="platform/system/libziparchive" path="system/libziparchive" revision="52fbc350b60cad09925b319e91bb9f05c76e4f93" upstream="build-tools-release" />
+ <project name="platform/system/libziparchive" path="system/libziparchive" revision="2754e8951f4be2e96a605550a95747dd02639ebf" upstream="build-tools-release" />
- <project name="platform/system/logging" path="system/logging" revision="e723ae4355e61ba140dd5964e87c8bcdbfedf10f" upstream="build-tools-release" />
+ <project name="platform/system/logging" path="system/logging" revision="601eef27c6d26c599962bb4232fd20df89187de3" upstream="build-tools-release" />
- <project name="platform/system/unwinding" path="system/unwinding" revision="687683989d86858a9347f1079f86a71be0f62e18" upstream="build-tools-release" />
+ <project name="platform/system/unwinding" path="system/unwinding" revision="7742bfe95af6662e9c3311a1d4baa04bb2f2978a" upstream="build-tools-release" />
- <project name="platform/system/tools/xsdc" path="system/tools/xsdc" revision="5e6067967e62fd2d99f4ca163921ef8f7b192d37" upstream="build-tools-release" />
+ <project name="platform/system/tools/xsdc" path="system/tools/xsdc" revision="3ba8aa48392ab0559b4cb4e2c440eec0ae39ae00" upstream="build-tools-release" />
- <project name="platform/test/app_compat/csuite" path="test/app_compat/csuite" revision="8a589526849a570527ac7239969719de4c427789" upstream="build-tools-release" />
+ <project name="platform/test/app_compat/csuite" path="test/app_compat/csuite" revision="3616dd6561e106df015109c2ebfa4f1c3569d97d" upstream="build-tools-release" />
- <project name="platform/art" path="art" revision="022454fd7eba4ab4cfebfe41ca835dd28fd3d649" upstream="build-tools-release" />
+ <project name="platform/art" path="art" revision="d15acb8a4f5b51e4c2b4602630c6574e898ff8e6" upstream="build-tools-release" />
<project name="platform/build/kati" path="build/kati" revision="6ad4268491b968b4cb257aeeb8c6a605ea8af8bf" upstream="build-tools-release" />
- <project name="platform/dalvik" path="dalvik" revision="306bf4c9967ba0ec975c5cc0985f563fc4e0b185" upstream="build-tools-release" />
+ <project name="platform/dalvik" path="dalvik" revision="2ed4e395d9c290db1c52482090cf7340f1c6f88d" upstream="build-tools-release" />
- <project name="platform/external/bc" path="external/bc" revision="ba4a6deebeb055fa3912363ed8f5f168dff44f3c" upstream="build-tools-release" />
+ <project name="platform/external/bc" path="external/bc" revision="70c7efce9b48dcc56ee71067c1a5526d48024e64" upstream="build-tools-release" />
<project name="platform/external/bison" path="external/bison" revision="661d941d054e51ed48d0683a643f5842051f4bba" upstream="build-tools-release" />
<project name="platform/external/bloaty" path="external/bloaty" revision="4e97ca09798800c00d8887d6b63992669fb1a631" upstream="build-tools-release" />
- <project name="platform/external/bzip2" path="external/bzip2" revision="019c6ed68ac1777d822d452fd9ffcddce2ea3db4" upstream="build-tools-release" />
+ <project name="platform/external/bzip2" path="external/bzip2" revision="727c7f5073e1c66974a2f9015e04a995177ca3cd" upstream="build-tools-release" />
<project name="platform/external/desugar" path="external/desugar" revision="2b6fe11a15a2d244f3bd2998bc361f7f89965281" upstream="build-tools-release" />
@@ -195,21 +195,21 @@
<project name="platform/external/nsjail" path="external/nsjail" revision="9c38c3715e4dfacda98a65a0f5606d9059eedf43" upstream="build-tools-release" />
- <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="098f2e36d8d6f2290c74b6c8664c7b016fc8971c" upstream="build-tools-release" />
+ <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="539f77df4407fddf23dce84e20a59b1475b20e3f" upstream="build-tools-release" />
<project name="platform/external/openssl" path="external/openssl" revision="005e88f9deb1e50b98694404bb85a688e119abeb" upstream="build-tools-release" />
- <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="b827859843896500f5b0e2db802b22ee0240956b" upstream="build-tools-release" />
+ <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="b9eb9031dbba4de801c48befe026a41602069484" upstream="build-tools-release" />
- <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="3735099615d9c32f5a4ef96ea4d25fd76409d0ae" upstream="build-tools-release" />
+ <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="22eedcea0d9ead89d519b9172c7024082212d274" upstream="build-tools-release" />
- <project name="platform/external/toybox" path="external/toybox" revision="57a0fa3324faa1a777f2364502603e108a95bdbc" upstream="build-tools-release" />
+ <project name="platform/external/toybox" path="external/toybox" revision="452165f60d9400513a39f9626bfe1c7a4eaf6297" upstream="build-tools-release" />
- <project name="platform/external/turbine" path="external/turbine" revision="0def9c449f3e2458b218b3237c2692eab0ce35d8" upstream="build-tools-release" />
+ <project name="platform/external/turbine" path="external/turbine" revision="03ba10854024c68eeace518ec0efce609930dfa8" upstream="build-tools-release" />
- <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="9341ecec390e611cef7ac9b5c1e847dd41dce69e" upstream="build-tools-release" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="f39c9981c3126d60abb920ca205120544f4bf3c0" upstream="build-tools-release" />
- <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="e9939679e45790186285a68c486c27c1cc34a990" upstream="build-tools-release" />
+ <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="932f604fe08824ef7e808aae36e2ac3d8ce88b9b" upstream="build-tools-release" />
<project name="toolchain/go" revision="3d3a0e158b3e6d07d03115452abed22f07bdc2b1" upstream="build-tools-release" />
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl.so b/sysroots/x86_64-linux-musl/lib/libc_musl.so
index 3dee389..fcf6794 100755
--- a/sysroots/x86_64-linux-musl/lib/libc_musl.so
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl.so
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
index bed483b..4104f6c 100644
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/linker.script b/sysroots/x86_64-linux-musl/lib/linker.script
index e8a1f7f..1680ee3 100755
--- a/sysroots/x86_64-linux-musl/lib/linker.script
+++ b/sysroots/x86_64-linux-musl/lib/linker.script
@@ -3,13 +3,13 @@
.linker_r 0x1000 : {
KEEP(*(.linker_r));
}
- .linker_rx 0x4dec4 : {
+ .linker_rx 0x4df44 : {
KEEP(*(.linker_rx));
}
- .linker_rw 0x116e30 : {
+ .linker_rw 0x116eb0 : {
KEEP(*(.linker_rw));
}
- .linker_rw2 0x118500 : {
+ .linker_rw2 0x118580 : {
KEEP(*(.linker_rw2));
}
/DISCARD/ : { *(.interp) }
diff --git a/update-prebuilts.sh b/update-prebuilts.sh
index d414a3f..4f18566 100755
--- a/update-prebuilts.sh
+++ b/update-prebuilts.sh
@@ -45,6 +45,7 @@
fetch_artifact linux build-common-prebuilts.zip "${tmpdir}/common.zip"
fetch_artifact linux manifest_${BUILD_NUMBER}.xml "${tmpdir}/manifest.xml"
fetch_artifact darwin_mac build-prebuilts.zip "${tmpdir}/darwin.zip"
+fetch_artifact linux_musl build-prebuilts.zip "${tmpdir}/linux_musl.zip"
fetch_artifact linux_musl musl-sysroot32.zip "${tmpdir}/musl-sysroot32.zip"
fetch_artifact linux_musl musl-sysroot64.zip "${tmpdir}/musl-sysroot64.zip"
@@ -57,12 +58,13 @@
unzip_to linux-x86 "${tmpdir}/linux.zip"
unzip_to common "${tmpdir}/common.zip"
unzip_to darwin-x86 "${tmpdir}/darwin.zip"
+unzip_to linux_musl-x86 "${tmpdir}/linux_musl.zip"
unzip_to sysroots/x86_64-linux-musl "${tmpdir}/musl-sysroot64.zip"
unzip_to sysroots/i686-linux-musl "${tmpdir}/musl-sysroot32.zip"
cp -f "${tmpdir}/manifest.xml" manifest.xml
-git add manifest.xml linux-x86 darwin-x86 common sysroots/x86_64-linux-musl sysroots/i686-linux-musl
+git add manifest.xml linux-x86 linux_musl-x86 darwin-x86 common sysroots/x86_64-linux-musl sysroots/i686-linux-musl
git commit -m "Update build-tools to ab/${BUILD_NUMBER}
https://ci.android.com/builds/branches/aosp-build-tools-release/grid?head=${BUILD_NUMBER}&tail=${BUILD_NUMBER}