Update crosvm prebuilt to 75113cccf457a4458ea9fd99ffdacceb2f31f84c
Bug: 153580313
Bug: 156130048
This updates crosvm with the gfxstream submit_cmd changes and increase
wayland display buffer count to allow higher fps.
Change-Id: I7769fbd6ff6f6369ee6e1112357df11430520b8d
diff --git a/aarch64-linux-gnu/Cargo.lock b/aarch64-linux-gnu/Cargo.lock
index 32f3266..ac70fe3 100644
--- a/aarch64-linux-gnu/Cargo.lock
+++ b/aarch64-linux-gnu/Cargo.lock
@@ -227,9 +227,9 @@
[[package]]
name = "futures"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780"
+checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
dependencies = [
"futures-channel",
"futures-core",
@@ -242,9 +242,9 @@
[[package]]
name = "futures-channel"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
dependencies = [
"futures-core",
"futures-sink",
@@ -252,15 +252,15 @@
[[package]]
name = "futures-core"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
+checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
[[package]]
name = "futures-executor"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba"
+checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
dependencies = [
"futures-core",
"futures-task",
@@ -269,15 +269,15 @@
[[package]]
name = "futures-io"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
+checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
[[package]]
name = "futures-macro"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -287,21 +287,24 @@
[[package]]
name = "futures-sink"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
[[package]]
name = "futures-task"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+dependencies = [
+ "once_cell",
+]
[[package]]
name = "futures-util"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
dependencies = [
"futures-channel",
"futures-core",
@@ -310,6 +313,7 @@
"futures-sink",
"futures-task",
"memchr",
+ "pin-project",
"pin-utils",
"proc-macro-hack",
"proc-macro-nested",
@@ -366,9 +370,9 @@
[[package]]
name = "hermit-abi"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
+checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71"
dependencies = [
"libc",
]
@@ -417,9 +421,9 @@
[[package]]
name = "libc"
-version = "0.2.69"
+version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
[[package]]
name = "libcras"
@@ -513,6 +517,12 @@
]
[[package]]
+name = "once_cell"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+
+[[package]]
name = "p9"
version = "0.1.0"
dependencies = [
@@ -522,9 +532,9 @@
[[package]]
name = "paste"
-version = "0.1.12"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a229b1c58c692edcaa5b9b0948084f130f55d2dcc15b02fcc5340b2b4521476"
+checksum = "d53181dcd37421c08d3b69f887784956674d09c3f9a47a04fece2b130a5b346b"
dependencies = [
"paste-impl",
"proc-macro-hack",
@@ -532,9 +542,9 @@
[[package]]
name = "paste-impl"
-version = "0.1.12"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0bf239e447e67ff6d16a8bb5e4d4bd2343acf5066061c0e8e06ac5ba8ca68c"
+checksum = "05ca490fa1c034a71412b4d1edcb904ec5a0981a4426c9eb2128c0fda7a68d17"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -543,6 +553,26 @@
]
[[package]]
+name = "pin-project"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "pin-utils"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -565,15 +595,15 @@
[[package]]
name = "ppv-lite86"
-version = "0.2.6"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
[[package]]
name = "proc-macro-hack"
-version = "0.5.15"
+version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
[[package]]
name = "proc-macro-nested"
@@ -583,9 +613,9 @@
[[package]]
name = "proc-macro2"
-version = "1.0.12"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"
+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
dependencies = [
"unicode-xid",
]
@@ -647,9 +677,9 @@
[[package]]
name = "quote"
-version = "1.0.4"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
+checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
dependencies = [
"proc-macro2",
]
@@ -743,9 +773,9 @@
[[package]]
name = "syn"
-version = "1.0.18"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
+checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
dependencies = [
"proc-macro2",
"quote",
diff --git a/aarch64-linux-gnu/bin/crosvm b/aarch64-linux-gnu/bin/crosvm
index f0b3f4e..e8336fa 100755
--- a/aarch64-linux-gnu/bin/crosvm
+++ b/aarch64-linux-gnu/bin/crosvm
Binary files differ
diff --git a/aarch64-linux-gnu/builder-packages.txt b/aarch64-linux-gnu/builder-packages.txt
index b6e1416..359a12f 100644
--- a/aarch64-linux-gnu/builder-packages.txt
+++ b/aarch64-linux-gnu/builder-packages.txt
@@ -1,11 +1,11 @@
adduser 3.118
-apt 1.8.2
-apt-utils 1.8.2
+apt 1.8.2.1
+apt-utils 1.8.2.1
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+deb10u4
base-passwd 3.5.46
bash 5.0-4
binutils 2.31.1-16
@@ -45,9 +45,9 @@
dwz 0.12-3
e2fsprogs 1.44.5-1+deb10u3
equivs 2.2.0
-exim4-base 4.92-8+deb10u3
-exim4-config 4.92-8+deb10u3
-exim4-daemon-light 4.92-8+deb10u3
+exim4-base 4.92-8+deb10u4
+exim4-config 4.92-8+deb10u4
+exim4-daemon-light 4.92-8+deb10u4
fakeroot 1.23-1
fdisk 2.33.1-0.1
file 1:5.35-4+deb10u1
@@ -87,8 +87,8 @@
libalgorithm-diff-xs-perl 0.04-5+b1
libalgorithm-merge-perl 0.08-3
libapparmor1:arm64 2.13.2-10
-libapt-inst2.0:arm64 1.8.2
-libapt-pkg5.0:arm64 1.8.2
+libapt-inst2.0:arm64 1.8.2.1
+libapt-pkg5.0:arm64 1.8.2.1
libarchive-cpio-perl 0.10-1
libarchive-zip-perl 1.64-1
libarchive13:arm64 3.3.3-4+deb10u1
@@ -226,14 +226,14 @@
libnftnl11:arm64 1.1.2-2
libnghttp2-14:arm64 1.36.0-2+deb10u1
libnpth0:arm64 1.6-1
-libnss-systemd:arm64 241-7~deb10u3
+libnss-systemd:arm64 241-7~deb10u4
libopengl0:arm64 1.1.0-1
libp11-kit0:arm64 0.23.15-2
libpam-cap:arm64 1:2.25-2
libpam-modules:arm64 1.3.1-5
libpam-modules-bin 1.3.1-5
libpam-runtime 1.3.1-5
-libpam-systemd:arm64 241-7~deb10u3
+libpam-systemd:arm64 241-7~deb10u4
libpam0g:arm64 1.3.1-5
libpcre2-8-0:arm64 10.32-5
libpcre3:arm64 2:8.39-12
@@ -280,15 +280,15 @@
libstdc++-8-dev:arm64 8.3.0-6
libstdc++6:arm64 8.3.0-6
libsys-hostname-long-perl 1.5-1
-libsystemd0:arm64 241-7~deb10u3
+libsystemd0:arm64 241-7~deb10u4
libtasn1-6:arm64 4.13-3
libtinfo6:arm64 6.1+20181013-2+deb10u2
libtool 2.4.6-9
libtsan0:arm64 8.3.0-6
libubsan1:arm64 8.3.0-6
libuchardet0:arm64 0.0.6-3
-libudev1:arm64 241-7~deb10u3
-libunbound8:arm64 1.9.0-2+deb10u1
+libudev1:arm64 241-7~deb10u4
+libunbound8:arm64 1.9.0-2+deb10u2
libunistring2:arm64 0.9.10-1
libusb-1.0-0:arm64 2:1.0.22-2
libusb-1.0-0-dev:arm64 2:1.0.22-2
@@ -345,7 +345,7 @@
libxxf86vm-dev:arm64 1:1.1.4-1+b2
libxxf86vm1:arm64 1:1.1.4-1+b2
libzstd1:arm64 1.3.8+dfsg-3
-linux-libc-dev:arm64 4.19.98-1+deb10u1
+linux-libc-dev:arm64 4.19.118-2
login 1:4.5-1.1
logrotate 3.14.0-4
lsb-base 10.2019051400
@@ -419,11 +419,11 @@
sensible-utils 0.0.12
shared-mime-info 1.10-1
sudo 1.8.27-1+deb10u2
-systemd 241-7~deb10u3
-systemd-sysv 241-7~deb10u3
+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
diff --git a/aarch64-linux-gnu/cargo_version.txt b/aarch64-linux-gnu/cargo_version.txt
index 7b6756a..cf68101 100644
--- a/aarch64-linux-gnu/cargo_version.txt
+++ b/aarch64-linux-gnu/cargo_version.txt
@@ -1,4 +1,4 @@
-cargo 1.43.0 (3532cf738 2020-03-17)
+cargo 1.43.0 (2cbe9048e 2020-05-03)
release: 1.43.0
-commit-hash: 3532cf738db005a56d1fe81ade514f380d411360
-commit-date: 2020-03-17
+commit-hash: 2cbe9048efc5c904b33191d799f97dc4698debaa
+commit-date: 2020-05-03
diff --git a/aarch64-linux-gnu/manifest.xml b/aarch64-linux-gnu/manifest.xml
index f3da2ef..e469b9a 100644
--- a/aarch64-linux-gnu/manifest.xml
+++ b/aarch64-linux-gnu/manifest.xml
@@ -7,7 +7,7 @@
<manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver"/>
<project groups="pdk" name="platform/external/adhd" path="external/adhd" revision="2e5b55c9a2bf11058945639ff8ddd513871c9a97" upstream="master"/>
- <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="f43fc1b31001569d43b3c4e5cd6c54b70a490add" upstream="master"/>
+ <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="75113cccf457a4458ea9fd99ffdacceb2f31f84c" upstream="master"/>
<project groups="pdk" name="platform/external/libepoxy" path="third_party/libepoxy" revision="199985a9b74aa5610a2ce75be2997e7a272dd9fe" upstream="crosvm-master"/>
<project groups="pdk" name="platform/external/minigbm" path="third_party/minigbm" revision="82e37a6c196d089140bf71a83dc0f6042d22ffd2" upstream="crosvm-master"/>
<project groups="pdk" name="platform/external/minijail" path="external/minijail" revision="2f2c20780cf7bbfe92657829cdae5a76cc4cb0c0" upstream="master"/>
diff --git a/aarch64-linux-gnu/rustup_show.txt b/aarch64-linux-gnu/rustup_show.txt
index 730d487..1139f2e 100644
--- a/aarch64-linux-gnu/rustup_show.txt
+++ b/aarch64-linux-gnu/rustup_show.txt
@@ -1,4 +1,4 @@
Default host: aarch64-unknown-linux-gnu
stable-aarch64-unknown-linux-gnu (overridden by '/source/platform/crosvm/rust-toolchain')
-rustc 1.43.0 (4fb7144ed 2020-04-20)
+rustc 1.43.1 (8d69840ab 2020-05-04)
diff --git a/x86_64-linux-gnu/Cargo.lock b/x86_64-linux-gnu/Cargo.lock
index 149db21..ac70fe3 100644
--- a/x86_64-linux-gnu/Cargo.lock
+++ b/x86_64-linux-gnu/Cargo.lock
@@ -421,9 +421,9 @@
[[package]]
name = "libc"
-version = "0.2.70"
+version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
[[package]]
name = "libcras"
@@ -532,9 +532,9 @@
[[package]]
name = "paste"
-version = "0.1.12"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a229b1c58c692edcaa5b9b0948084f130f55d2dcc15b02fcc5340b2b4521476"
+checksum = "d53181dcd37421c08d3b69f887784956674d09c3f9a47a04fece2b130a5b346b"
dependencies = [
"paste-impl",
"proc-macro-hack",
@@ -542,9 +542,9 @@
[[package]]
name = "paste-impl"
-version = "0.1.12"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0bf239e447e67ff6d16a8bb5e4d4bd2343acf5066061c0e8e06ac5ba8ca68c"
+checksum = "05ca490fa1c034a71412b4d1edcb904ec5a0981a4426c9eb2128c0fda7a68d17"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -601,9 +601,9 @@
[[package]]
name = "proc-macro-hack"
-version = "0.5.15"
+version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
[[package]]
name = "proc-macro-nested"
@@ -613,9 +613,9 @@
[[package]]
name = "proc-macro2"
-version = "1.0.13"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53f5ffe53a6b28e37c9c1ce74893477864d64f74778a93a4beb43c8fa167f639"
+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
dependencies = [
"unicode-xid",
]
@@ -773,9 +773,9 @@
[[package]]
name = "syn"
-version = "1.0.23"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b5f192649e48a5302a13f2feb224df883b98933222369e4b3b0fe2a5447269"
+checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
dependencies = [
"proc-macro2",
"quote",
diff --git a/x86_64-linux-gnu/bin/crosvm b/x86_64-linux-gnu/bin/crosvm
index d1b37c6..eefb46c 100755
--- a/x86_64-linux-gnu/bin/crosvm
+++ b/x86_64-linux-gnu/bin/crosvm
Binary files differ
diff --git a/x86_64-linux-gnu/builder-packages.txt b/x86_64-linux-gnu/builder-packages.txt
index 8b0f305..53c381a 100644
--- a/x86_64-linux-gnu/builder-packages.txt
+++ b/x86_64-linux-gnu/builder-packages.txt
@@ -345,7 +345,7 @@
libubsan1-arm64-cross 8.3.0-2cross1
libuchardet0:amd64 0.0.6-3
libudev1:amd64 241-7~deb10u3
-libunbound8:amd64 1.9.0-2+deb10u1
+libunbound8:amd64 1.9.0-2+deb10u2
libunistring2:amd64 0.9.10-1
liburi-perl 1.76-1
libusb-1.0-0:amd64 2:1.0.22-2
diff --git a/x86_64-linux-gnu/manifest.xml b/x86_64-linux-gnu/manifest.xml
index be61b8c..40eea28 100644
--- a/x86_64-linux-gnu/manifest.xml
+++ b/x86_64-linux-gnu/manifest.xml
@@ -13,7 +13,7 @@
<project clone-depth="1" name="platform/external/astc-codec" path="external/astc-codec" revision="17ae36822a8084f45ae51f9031e81f8318254f33"/>
<project clone-depth="1" name="platform/external/boringssl" path="external/boringssl" revision="ca167a7fa32afdadad014cc9e8a7ab2f4f879f8d"/>
<project clone-depth="1" name="platform/external/c-ares" path="external/cares" revision="b88261c9132d21c234dfbf36db3c6c3f5780051a"/>
- <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="f43fc1b31001569d43b3c4e5cd6c54b70a490add" upstream="master"/>
+ <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="75113cccf457a4458ea9fd99ffdacceb2f31f84c" upstream="master"/>
<project clone-depth="1" name="platform/external/curl" path="external/curl" revision="1da4b04273638c8afe6f88bd7a7ccfb693640773"/>
<project clone-depth="1" name="platform/external/deqp" path="external/deqp" revision="2e0e4509307699b52548cfd63c75b3f8dce07073"/>
<project clone-depth="1" name="platform/external/ffmpeg" path="external/ffmpeg" revision="5c6f92dd1b16590153367ce79ed9b098cace354f"/>
