Snap for 6912731 from 6dde2e93cd8324abc982d6db7a7a80ff56b6af10 to emu-30-releaseemu-30-release

Change-Id: I8559b6074e8ed2c0b0a3e324093da53e82489858

10 files changed, 53 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 65691c2..db45101 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,11 +14,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_prebuilt_binary {
+sh_binary_host {
   name: "common_crosvm",
-  stem: "crosvm",
-  srcs: ["scripts/crosvm"],
-  defaults: ["cuttlefish_host_only"],
+  filename: "crosvm",
+  target: {
+    linux_glibc: {
+      src: "scripts/crosvm",
+    },
+    darwin: {
+      src: "scripts/crosvm",
+    },
+    linux_bionic: {
+      src: "scripts/crosvm_bionic",
+    },
+  },
 }
 // NOTE: Using cc_prebuilt_binary because cc_prebuilt_library can't handle stem on pie
 
diff --git a/manifest.xml b/manifest.xml
index 6b865db..7a2f7e0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -13,35 +13,35 @@
   <project groups="crosvm" name="platform/tools/repohooks" path="tools/repohooks" revision="3798d7e067b927a16dc9e47bc6af949f9a2f4e20"/>
   <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks"/>
   <project groups="gfxstream" name="platform/external/ffmpeg" path="external/ffmpeg" revision="5c6f92dd1b16590153367ce79ed9b098cace354f"/>
-  <project groups="gfxstream" name="platform/external/boringssl" path="external/boringssl" revision="ba9db8781ec11859132f543aebff5d6093214751"/>
+  <project groups="gfxstream" name="platform/external/boringssl" path="external/boringssl" revision="07e050eb7fd8a6c6456bf6ce6cd7c289b2e338ef"/>
   <project groups="gfxstream" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="7ef4cb95e1ed4305e99f03a8e8ad28d26134a45b"/>
   <project groups="gfxstream" name="device/generic/vulkan-cereal" path="device/generic/vulkan-cereal" revision="ea978cef5a41c292dd9bd0ce9bf08648e76ca030"/>
   <project groups="gfxstream" name="platform/external/protobuf" path="external/protobuf" revision="ca15ad7fb89a626c0d2a98240b11a2523727f9be"/>
   <project groups="gfxstream" name="platform/external/libusb" path="external/libusb" revision="ad0473413edec14805e59599ff537eba0f5b8d33"/>
   <project groups="gfxstream" name="platform/external/grpc-grpc" path="external/grpc" revision="0d80ea35ba09d0462ca13f236cc9ddc3fb749c57"/>
-  <project groups="gfxstream" name="platform/external/googletest" path="external/googletest" revision="38e8cf709f2461c458dc487a3455022900af783a"/>
+  <project groups="gfxstream" name="platform/external/googletest" path="external/googletest" revision="ee3fca52fa6409aacab73bf519633d21a3a3a738"/>
   <project groups="gfxstream" name="platform/external/tinyobjloader" path="external/tinyobjloader" revision="d16a940067fbc191364fc1d3e2a2d907209c9320"/>
-  <project groups="gfxstream" name="device/generic/goldfish-opengl" path="device/generic/goldfish-opengl" revision="3eb1c73065464bcf703069e48bd6b17a31bd8fc8"/>
+  <project groups="gfxstream" name="device/generic/goldfish-opengl" path="device/generic/goldfish-opengl" revision="8d4f39f4a7361d959f0e1f2d019fe210a9f31920"/>
   <project groups="gfxstream" name="platform/external/libffi" path="external/libffi" revision="30bc66eb2043d8434e94f29beda87001e58c2a34"/>
   <project groups="gfxstream" name="platform/external/angle" path="external/angle" revision="61ed0a943789204b9cc14074afdfb8587a345ef8"/>
   <project groups="gfxstream" name="platform/external/libpng" path="external/libpng" revision="5d19b1bb0f5694f2ae47b3cc2ccfeb571764b439"/>
   <project groups="gfxstream" name="platform/external/lz4" path="external/lz4" revision="1a184fdeb99f4cc11b774ac5b0b824b38105ec6c"/>
   <project groups="gfxstream" name="platform/external/nasm" path="external/nasm" revision="645e4f02c622ba67eb754000cc00c9db8be31f85"/>
   <project groups="gfxstream" name="platform/external/curl" path="external/curl" revision="1da4b04273638c8afe6f88bd7a7ccfb693640773"/>
-  <project groups="gfxstream" name="platform/external/libyuv" path="external/libyuv" revision="2ee3028b36ac61abed29cbb379a411a98fe31677"/>
+  <project groups="gfxstream" name="platform/external/libyuv" path="external/libyuv" revision="df6bc4ade7d8a2923269e543b27175eeee26e90b"/>
   <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/protobuf" path="prebuilts/android-emulator-build/protobuf" revision="8e2a5472dd374e6c971d30eb3d00898a8c1a25c8"/>
-  <project groups="gfxstream" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="0e9e7035bf8ad42437c6156e5950eab13655b26c"/>
-  <project groups="gfxstream" 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="90e45fec56fdeac84c9eb174c63fa6e748c6faa9"/>
-  <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/common" path="prebuilts/android-emulator-build/common" revision="8314f26e316eaf90496cba19ecedd69aeb00b895"/>
+  <project groups="gfxstream" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="8c62cb647097f74de4fef942e39d845ecb476c10"/>
+  <project groups="gfxstream" 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="70a8d2affe5a31cbb6ae03469a83981b3331c9a4"/>
+  <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/common" path="prebuilts/android-emulator-build/common" revision="46f6c3d021ff6ec4a4d1464fe921d2eb1608c5c9"/>
   <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/mesa" path="prebuilts/android-emulator-build/mesa" revision="be7c00f399b415511d73308f0af0c0310512aced"/>
   <project groups="gfxstream" name="platform/external/google-breakpad" path="external/google-breakpad" revision="a1414818b9f9810a3b45f1f55d9c00f5116ec7d9"/>
-  <project groups="gfxstream" name="platform/external/deqp" path="external/deqp" revision="ee2101f344ad88ceee4e15ce4afcf2eab2df3c9d"/>
+  <project groups="gfxstream" name="platform/external/deqp" path="external/deqp" revision="7949c69a10e39ce76e2af700a1c3ee29756ad51e"/>
   <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/curl" path="prebuilts/android-emulator-build/curl" revision="06f0905068b9ebfdd2d11b4d310c36b68c2fbe2f"/>
   <project groups="gfxstream" name="platform/external/zlib" path="external/zlib" revision="7656f9eff09cc38244978773777ee64b7b31155d"/>
   <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/mesa-deps" path="prebuilts/android-emulator-build/mesa-deps" revision="17837fdb1889014fa01cbbbda56afc9b6034815f"/>
   <project groups="gfxstream" name="platform/external/libvpx" path="external/libvpx" revision="62332cf39b0302e240acb10ed78d61d5ea282a39"/>
   <project groups="gfxstream" name="platform/external/c-ares" path="external/cares" revision="b88261c9132d21c234dfbf36db3c6c3f5780051a"/>
-  <project groups="gfxstream" name="platform/external/qemu" path="external/qemu" revision="57b6653ba209c69ca762704c3245339189b175b2"/>
+  <project groups="gfxstream" name="platform/external/qemu" path="external/qemu" revision="1ff47c5b95b509f124a653e5b50568f63204cda4"/>
   <project groups="gfxstream" name="platform/external/astc-codec" path="external/astc-codec" revision="17ae36822a8084f45ae51f9031e81f8318254f33"/>
   <project groups="gfxstream" name="platform/prebuilts/android-emulator-build/qemu-android-deps" path="prebuilts/android-emulator-build/qemu-android-deps" revision="715d3bed0a3dc4f9980528c9bfb81469f2d3cbab"/>
   <project groups="gfxstream" name="platform/external/google-benchmark" path="external/google-benchmark" revision="db1632fadc79df388a2a7248157c965ee40248a1"/>
diff --git a/rebuild-internal.sh b/rebuild-internal.sh
index 7fdecd4..b60dc10 100755
--- a/rebuild-internal.sh
+++ b/rebuild-internal.sh
@@ -139,7 +139,7 @@ fetch_source() {
   fi
 
   cp ${CUSTOM_MANIFEST} manifest.xml
-  repo init --partial-clone -q -u https://android.googlesource.com/platform/manifest -m ../../manifest.xml
+  repo init --depth=1 -q -u https://android.googlesource.com/platform/manifest -m ../../manifest.xml
   repo sync
 }
 
@@ -276,9 +276,15 @@ compile_gfxstream() {
 
   # TODO: Fix or remove network unit tests that are failing in docker,
   # so we can take out "notests"
-  python3 android/build/python/cmake.py --gfxstream_only --notests
+  python3 android/build/python/cmake.py --gfxstream_only --no-tests
   local dist_dir="${SOURCE_DIR}/external/qemu/objs/distribution/emulator/lib64"
 
+  chmod +x "${dist_dir}/libc++.so.1"
+  chmod +x "${dist_dir}/libandroid-emu-shared.so"
+  chmod +x "${dist_dir}/libemugl_common.so"
+  chmod +x "${dist_dir}/libOpenglRender.so"
+  chmod +x "${dist_dir}/libgfxstream_backend.so"
+
   cp "${dist_dir}/libc++.so.1" "${OUTPUT_LIB_DIR}"
   cp "${dist_dir}/libandroid-emu-shared.so" "${OUTPUT_LIB_DIR}"
   cp "${dist_dir}/libemugl_common.so" "${OUTPUT_LIB_DIR}"
diff --git a/scripts/crosvm_bionic b/scripts/crosvm_bionic
new file mode 100644
index 0000000..6399fb9
--- /dev/null
+++ b/scripts/crosvm_bionic
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Execute crosvm using the Bionic linker. This is because DT_INTERP of the
+# host rust binaries are incorrectly set to /system/bin/linker64. The path
+# doesn't exist on host targets, but this is unavoidable because we are
+# building the host rust binaries using "-target aarch64-linux-android".
+# The target is for Android and therefore DT_INTERP is set to that of Android.
+# We have to use the target until rustc supports non-Android target using Bionic
+# as libc. Until then, let's override DT_INTERP by executing the dynamic linker
+# and feed the absolute path to the rust binary as the first argument.
+$(dirname $0)/linker64 $(readlink -f ./$(uname -m)-linux-bionic/$(basename "$0")) "${@}"
diff --git a/x86_64-linux-gnu/bin/libOpenglRender.so b/x86_64-linux-gnu/bin/libOpenglRender.so
index 0aa3532..3cf7703 100644..100755
--- a/x86_64-linux-gnu/bin/libOpenglRender.so
+++ b/x86_64-linux-gnu/bin/libOpenglRender.so
diff --git a/x86_64-linux-gnu/bin/libandroid-emu-shared.so b/x86_64-linux-gnu/bin/libandroid-emu-shared.so
index eb1239f..93c95af 100644..100755
--- a/x86_64-linux-gnu/bin/libandroid-emu-shared.so
+++ b/x86_64-linux-gnu/bin/libandroid-emu-shared.so
diff --git a/x86_64-linux-gnu/bin/libc++.so.1 b/x86_64-linux-gnu/bin/libc++.so.1
index cb15bbb..e8f4a1a 100644..100755
--- a/x86_64-linux-gnu/bin/libc++.so.1
+++ b/x86_64-linux-gnu/bin/libc++.so.1
diff --git a/x86_64-linux-gnu/bin/libemugl_common.so b/x86_64-linux-gnu/bin/libemugl_common.so
index 3bb8545..2ec868d 100644..100755
--- a/x86_64-linux-gnu/bin/libemugl_common.so
+++ b/x86_64-linux-gnu/bin/libemugl_common.so
diff --git a/x86_64-linux-gnu/bin/libgfxstream_backend.so b/x86_64-linux-gnu/bin/libgfxstream_backend.so
index 6386010..47f0200 100644..100755
--- a/x86_64-linux-gnu/bin/libgfxstream_backend.so
+++ b/x86_64-linux-gnu/bin/libgfxstream_backend.so
diff --git a/x86_64-linux-gnu/builder-packages.txt b/x86_64-linux-gnu/builder-packages.txt
index cedc957..711d630 100644
--- a/x86_64-linux-gnu/builder-packages.txt
+++ b/x86_64-linux-gnu/builder-packages.txt
@@ -5,7 +5,7 @@ autoconf	2.69-11
 automake	1:1.16.1-4
 autopoint	0.19.8.1-9
 autotools-dev	20180224.1
-base-files	10.3+deb10u3
+base-files	10.3+deb10u5
 base-passwd	3.5.46
 bash	5.0-4
 binutils	2.31.1-16
@@ -100,7 +100,7 @@ libalgorithm-diff-xs-perl	0.04-5+b1
 libalgorithm-merge-perl	0.08-3
 libapparmor1:amd64	2.13.2-10
 libapt-inst2.0:amd64	1.8.2.1
-libapt-pkg5.0:amd64	1.8.2
+libapt-pkg5.0:amd64	1.8.2.1
 libarchive-cpio-perl	0.10-1
 libarchive-zip-perl	1.64-1
 libarchive13:amd64	3.3.3-4+deb10u1
@@ -240,7 +240,7 @@ libkrb5support0:amd64	1.17-3
 libksba8:amd64	1.3.5-2
 libldap-2.4-2:amd64	2.4.47+dfsg-3+deb10u2
 libldap-common	2.4.47+dfsg-3+deb10u2
-libllvm7:amd64	1:7.0.1-8
+libllvm7:amd64	1:7.0.1-8+deb10u2
 liblocale-gettext-perl	1.07-3+b4
 liblockfile-bin	1.14-1.1
 liblockfile1:amd64	1.14-1.1
@@ -284,6 +284,7 @@ libpam-modules-bin	1.3.1-5
 libpam-runtime	1.3.1-5
 libpam-systemd:amd64	241-7~deb10u4
 libpam0g:amd64	1.3.1-5
+libpciaccess-dev:amd64	0.14-1
 libpciaccess0:amd64	0.14-1
 libpcre2-8-0:amd64	10.32-5
 libpcre3:amd64	2:8.39-12
@@ -344,7 +345,7 @@ libtsan0-arm64-cross	8.3.0-2cross1
 libubsan1:amd64	8.3.0-6
 libubsan1-arm64-cross	8.3.0-2cross1
 libuchardet0:amd64	0.0.6-3
-libudev1:amd64	241-7~deb10u3
+libudev1:amd64	241-7~deb10u4
 libunbound8:amd64	1.9.0-2+deb10u2
 libunistring2:amd64	0.9.10-1
 liburi-perl	1.76-1
@@ -362,11 +363,11 @@ libwayland-server0:amd64	1.16.0-1
 libwrap0:amd64	7.6.q-28
 libwww-perl	6.36-2
 libwww-robotrules-perl	6.02-1
-libx11-6:amd64	2:1.6.7-1
-libx11-data	2:1.6.7-1
-libx11-dev:amd64	2:1.6.7-1
-libx11-xcb-dev:amd64	2:1.6.7-1
-libx11-xcb1:amd64	2:1.6.7-1
+libx11-6:amd64	2:1.6.7-1+deb10u1
+libx11-data	2:1.6.7-1+deb10u1
+libx11-dev:amd64	2:1.6.7-1+deb10u1
+libx11-xcb-dev:amd64	2:1.6.7-1+deb10u1
+libx11-xcb1:amd64	2:1.6.7-1+deb10u1
 libxau-dev:amd64	1:1.0.8-1+b2
 libxau6:amd64	1:1.0.8-1+b2
 libxcb-dri2-0:amd64	1.13.1-2
@@ -415,7 +416,7 @@ libyaml-0-2:amd64	0.2.1-1
 libyaml-libyaml-perl	0.76+repack-1
 libyaml-perl	1.27-1
 libzstd1:amd64	1.3.8+dfsg-3
-linux-libc-dev:amd64	4.19.132-1
+linux-libc-dev:amd64	4.19.146-1
 linux-libc-dev-arm64-cross	4.19.20-1cross1
 login	1:4.5-1.1
 logrotate	3.14.0-4
@@ -495,7 +496,7 @@ systemd	241-7~deb10u4
 systemd-sysv	241-7~deb10u4
 sysvinit-utils	2.93-8
 tar	1.30+dfsg-6
-tzdata	2019c-0+deb10u1
+tzdata	2020a-0+deb10u1
 ucf	3.0038+nmu1
 util-linux	2.33.1-0.1
 x11proto-core-dev	2018.4-4