Update x86_64 crosvm build to fix access to console
Bug: 148677254
Test: locally
Change-Id: I48dcb7bbf511cb39a2a7e9ee656712aef98ca7e5
diff --git a/aarch64-linux-gnu/manifest.xml b/aarch64-linux-gnu/manifest.xml
index 0827c8c..5e14a65 100644
--- a/aarch64-linux-gnu/manifest.xml
+++ b/aarch64-linux-gnu/manifest.xml
@@ -6,11 +6,11 @@
<manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver"/>
- <project groups="pdk" name="platform/external/adhd" path="third_party/adhd" revision="e65070b653154252b7c66ec983c8df842f932f77" upstream="crosvm-master"/>
- <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="827f1192f97f815b3ba5666834b7b5bf6f94dcc6" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/adhd" path="third_party/adhd" revision="a3e81aa1cef605f2a1b3deb4dcf3e992ec1d602e" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="768b3825d0e0b0bb920dd5233e4e6621093e1835" upstream="crosvm-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="third_party/minijail" revision="52f6adabb6f44761cc23a226cc396bd5c664641c" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/minijail" path="aosp/external/minijail" revision="52f6adabb6f44761cc23a226cc396bd5c664641c" upstream="crosvm-master"/>
<project groups="pdk" name="platform/external/virglrenderer" path="third_party/virglrenderer" revision="be6ae27bc7901566619edb05ab1fb34a76ebf44f" upstream="crosvm-master"/>
<project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="8eb7cd76622697f630a52cfcaf14a4971be21e38" upstream="crosvm-master"/>
diff --git a/rebuild-internal.sh b/rebuild-internal.sh
index 6bbe169..90ec29c 100755
--- a/rebuild-internal.sh
+++ b/rebuild-internal.sh
@@ -156,7 +156,7 @@
compile_minijail() {
echo "Compiling Minijail..."
- cd "${SOURCE_DIR}/third_party/minijail"
+ cd "${SOURCE_DIR}/aosp/external/minijail"
make -j OUT="${WORKING_DIR}"
diff --git a/x86_64-linux-gnu/Cargo.lock b/x86_64-linux-gnu/Cargo.lock
index 81abd93..bb75235 100644
--- a/x86_64-linux-gnu/Cargo.lock
+++ b/x86_64-linux-gnu/Cargo.lock
@@ -12,10 +12,18 @@
"kvm 0.1.0",
"kvm_sys 0.1.0",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
+ "vm_control 0.1.0",
+]
+
+[[package]]
+name = "acpi_tables"
+version = "0.1.0"
+dependencies = [
+ "data_model 0.1.0",
]
[[package]]
@@ -30,6 +38,7 @@
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
+ "vm_control 0.1.0",
]
[[package]]
@@ -39,6 +48,10 @@
[[package]]
name = "audio_streams"
version = "0.1.0"
+dependencies = [
+ "sync 0.1.0",
+ "sys_util 0.1.0",
+]
[[package]]
name = "bit_field"
@@ -51,9 +64,9 @@
name = "bit_field_derive"
version = "0.1.0"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -75,14 +88,28 @@
name = "cras-sys"
version = "0.1.0"
dependencies = [
+ "audio_streams 0.1.0",
"data_model 0.1.0",
]
[[package]]
+name = "cros_async"
+version = "0.1.0"
+dependencies = [
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_util 0.1.0",
+ "syscall_defines 0.1.0",
+]
+
+[[package]]
name = "crosvm"
version = "0.1.0"
dependencies = [
"aarch64 0.1.0",
+ "acpi_tables 0.1.0",
"arch 0.1.0",
"assertions 0.1.0",
"audio_streams 0.1.0",
@@ -101,13 +128,14 @@
"kvm_sys 0.1.0",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
"libcras 0.1.0",
+ "minijail-sys 0.0.11",
"msg_socket 0.1.0",
"net_util 0.1.0",
"p9 0.1.0",
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"protos 0.1.0",
"rand_ish 0.1.0",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
@@ -159,7 +187,7 @@
"net_util 0.1.0",
"p9 0.1.0",
"protos 0.1.0",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
@@ -181,7 +209,7 @@
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"protos 0.1.0",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sys_util 0.1.0",
]
@@ -189,9 +217,91 @@
name = "enumn"
version = "0.1.0"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-task"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-util"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -235,7 +345,7 @@
version = "0.1.0"
dependencies = [
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "net_sys 0.1.0",
+ "minijail-sys 0.0.11",
]
[[package]]
@@ -285,7 +395,6 @@
"cras-sys 0.1.0",
"data_model 0.1.0",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "sync 0.1.0",
"sys_util 0.1.0",
]
@@ -307,19 +416,35 @@
]
[[package]]
+name = "memchr"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "minijail-sys"
+version = "0.0.11"
+dependencies = [
+ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "msg_on_socket_derive"
version = "0.1.0"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "msg_socket"
version = "0.1.0"
dependencies = [
+ "cros_async 0.1.0",
"data_model 0.1.0",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
"msg_on_socket_derive 0.1.0",
"sys_util 0.1.0",
]
@@ -358,6 +483,31 @@
]
[[package]]
+name = "paste"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "paste-impl"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "pkg-config"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -366,17 +516,32 @@
name = "poll_token_derive"
version = "0.1.0"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "proc-macro2"
-version = "0.4.21"
+name = "proc-macro-hack"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -432,10 +597,10 @@
[[package]]
name = "quote"
-version = "0.6.10"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -444,12 +609,12 @@
[[package]]
name = "remain"
-version = "0.1.2"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -463,13 +628,18 @@
]
[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "syn"
-version = "0.15.26"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -521,7 +691,7 @@
[[package]]
name = "unicode-xid"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -538,7 +708,7 @@
"assertions 0.1.0",
"data_model 0.1.0",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sys_util 0.1.0",
"usb_sys 0.1.0",
]
@@ -584,18 +754,18 @@
name = "wire_format_derive"
version = "0.1.0"
dependencies = [
- "proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "x86_64"
version = "0.1.0"
dependencies = [
+ "acpi_tables 0.1.0",
"arch 0.1.0",
"assertions 0.1.0",
- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
"data_model 0.1.0",
"devices 0.1.0",
"io_jail 0.1.0",
@@ -604,28 +774,45 @@
"kvm 0.1.0",
"kvm_sys 0.1.0",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
+ "vm_control 0.1.0",
]
[metadata]
"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
+"checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987"
+"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86"
+"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866"
+"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231"
+"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff"
+"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764"
+"checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16"
+"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9"
+"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76"
"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
"checksum libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)" = "10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311"
"checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
+"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49"
+"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
+"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
"checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f"
-"checksum proc-macro2 0.4.21 (registry+https://github.com/rust-lang/crates.io-index)" = "ab2fc21ba78ac73e4ff6b3818ece00be4e175ffbef4d0a717d978b48b24150c4"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
"checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
"checksum protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12c6abd78435445fc86898ebbd0521a68438063d4a73e23527b7134e6bf58b4a"
"checksum protoc 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3998c4bc0af8ccbd3cc68245ee9f72663c5ae2fb78bc48ff7719aef11562edea"
"checksum protoc-rust 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "234c97039c32bb58a883d0deafa57db37e59428ce536f3bdfe1c46cffec04113"
-"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
-"checksum remain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3bec2543b50be4539fdc27fde082e218cf4c3895358ca77f5c52fe930589e209"
-"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "99c861227fc40c8da6fdaa3d58144ac84c0537080a43eb1d7d45c28f88dcb888"
+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/x86_64-linux-gnu/bin/crosvm b/x86_64-linux-gnu/bin/crosvm
index 5410cb6..ac67d11 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/bin/libepoxy.so.0 b/x86_64-linux-gnu/bin/libepoxy.so.0
index c72194d..2c60f7e 100755
--- a/x86_64-linux-gnu/bin/libepoxy.so.0
+++ b/x86_64-linux-gnu/bin/libepoxy.so.0
Binary files differ
diff --git a/x86_64-linux-gnu/bin/libgbm.so.1 b/x86_64-linux-gnu/bin/libgbm.so.1
index 119be3b..4950cd4 100755
--- a/x86_64-linux-gnu/bin/libgbm.so.1
+++ b/x86_64-linux-gnu/bin/libgbm.so.1
Binary files differ
diff --git a/x86_64-linux-gnu/bin/libminijail.so b/x86_64-linux-gnu/bin/libminijail.so
index 48c58fe..2cb7bff 100755
--- a/x86_64-linux-gnu/bin/libminijail.so
+++ b/x86_64-linux-gnu/bin/libminijail.so
Binary files differ
diff --git a/x86_64-linux-gnu/bin/libvirglrenderer.so.1 b/x86_64-linux-gnu/bin/libvirglrenderer.so.1
index 0ecd7f8..f1b230d 100755
--- a/x86_64-linux-gnu/bin/libvirglrenderer.so.1
+++ b/x86_64-linux-gnu/bin/libvirglrenderer.so.1
Binary files differ
diff --git a/x86_64-linux-gnu/builder-packages.txt b/x86_64-linux-gnu/builder-packages.txt
index 752cec0..9a2441e 100644
--- a/x86_64-linux-gnu/builder-packages.txt
+++ b/x86_64-linux-gnu/builder-packages.txt
@@ -1,9 +1,9 @@
adduser 3.118
-apparmor 2.13.2-10
apt 1.8.2
apt-utils 1.8.2
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-passwd 3.5.46
@@ -12,16 +12,15 @@
binutils-aarch64-linux-gnu 2.31.1-16
binutils-common:amd64 2.31.1-16
binutils-x86-64-linux-gnu 2.31.1-16
+bsd-mailx 8.1.2-0.20180807cvs-1
bsdmainutils 11.1.2+b1
bsdutils 1:2.33.1-0.1
build-essential 12.6
bzip2 1.0.6-9.2~deb10u1
ca-certificates 20190110
-chrony 3.4-4
cmake 3.13.4-1
cmake-data 3.13.4-1
coreutils 8.30-3
-cpio 2.12+dfsg-9
cpp 4:8.3.0-1
cpp-8 8.3.0-6
cpp-8-aarch64-linux-gnu 8.3.0-2cross1
@@ -33,19 +32,28 @@
dash 0.5.10.2-5
dbus 1.12.16-1
debconf 1.5.71
+debhelper 12.1.1
debian-archive-keyring 2019.1
debianutils 4.8.6.1
+dh-autoreconf 19
dh-python 3.20190308
+dh-strip-nondeterminism 1.1.2-1
+dialog 1.3-20190211-1
diffutils 1:3.7-3
dirmngr 2.2.12-1+deb10u1
-distro-info-data 0.41+deb10u1
-dmidecode 3.2-1
dmsetup 2:1.02.155-3
+dns-root-data 2019031302
+dnsmasq 2.80-1
+dnsmasq-base 2.80-1
dpkg 1.19.7
dpkg-cross 2.6.15-3
dpkg-dev 1.19.7
+dwz 0.12-3
e2fsprogs 1.44.5-1+deb10u3
-efibootmgr 15-1
+equivs 2.2.0
+exim4-base 4.92-8+deb10u3
+exim4-config 4.92-8+deb10u3
+exim4-daemon-light 4.92-8+deb10u3
fakeroot 1.23-1
fdisk 2.33.1-0.1
file 1:5.35-4+deb10u1
@@ -61,7 +69,7 @@
gcc-8-base:amd64 8.3.0-6
gcc-8-cross-base 8.3.0-2cross1
gcc-aarch64-linux-gnu 4:8.3.0-1
-gce-disk-expand 1:20190708.00-g1
+gettext 0.19.8.1-9
gettext-base 0.19.8.1-9
gir1.2-glib-2.0:amd64 1.58.3-2
git 1:2.20.1-2+deb10u1
@@ -69,11 +77,6 @@
gnupg 2.2.12-1+deb10u1
gnupg-l10n 2.2.12-1+deb10u1
gnupg-utils 2.2.12-1+deb10u1
-google-cloud-packages-archive-keyring 1.2-1
-google-cloud-sdk 279.0.0-0
-google-compute-engine 1:20190916.00-g2
-google-compute-engine-oslogin 1:20191014.00-g1+deb10
-google-osconfig-agent 1:20200130.01-g1
gpg 2.2.12-1+deb10u1
gpg-agent 2.2.12-1+deb10u1
gpg-wks-client 2.2.12-1+deb10u1
@@ -83,26 +86,12 @@
gpgv 2.2.12-1+deb10u1
grep 3.3-1
groff-base 1.22.4-3
-grub-cloud-amd64 0.0.4
-grub-common 2.02+dfsg1-20
-grub-efi-amd64-bin 2.02+dfsg1-20
-grub-efi-amd64-signed 1+2.02+dfsg1+20
-grub-pc-bin 2.02+dfsg1-20
-grub2-common 2.02+dfsg1-20
gzip 1.9-3
-haveged 1.9.1-7
hostname 3.21
-ifupdown 0.8.35
-init 1.56+nmu1
init-system-helpers 1.56+nmu1
-initramfs-tools 0.133+deb10u1
-initramfs-tools-core 0.133+deb10u1
+intltool-debian 0.35.0+20060710.5
iproute2 4.20.0-2
iptables 1.8.2-4
-iputils-ping 3:20180629-2
-isc-dhcp-client 4.4.1-2
-klibc-utils 2.0.6-1
-kmod 26-1
krb5-locales 1.17-3
less 487-0.1+b1
libacl1:amd64 2.2.53-4
@@ -112,11 +101,14 @@
libapparmor1:amd64 2.13.2-10
libapt-inst2.0:amd64 1.8.2
libapt-pkg5.0:amd64 1.8.2
+libarchive-cpio-perl 0.10-1
+libarchive-zip-perl 1.64-1
libarchive13:amd64 3.3.3-4+deb10u1
libargon2-1:amd64 0~20171227-0.2
libasan5:amd64 8.3.0-6
libasan5-arm64-cross 8.3.0-2cross1
libassuan0:amd64 2.5.2-1
+libatm1:amd64 1:2.5.1-2
libatomic1:amd64 8.3.0-6
libatomic1-arm64-cross 8.3.0-2cross1
libattr1:amd64 1:2.4.48-4
@@ -141,6 +133,7 @@
libcom-err2:amd64 1.44.5-1+deb10u3
libconfig-auto-perl 0.44-1
libconfig-inifiles-perl 3.000001-1
+libcroco3:amd64 0.6.12-3
libcryptsetup12:amd64 2:2.1.0-5+deb10u2
libcurl3-gnutls:amd64 7.64.0-4+deb10u1
libcurl4:amd64 7.64.0-4+deb10u1
@@ -150,7 +143,6 @@
libdebconfclient0:amd64 0.249
libdebian-dpkgcross-perl 2.6.15-3
libdevmapper1.02.1:amd64 2:1.02.155-3
-libdns-export1104 1:9.11.5.P4+dfsg-5.1
libdpkg-perl 1.19.7
libdrm-amdgpu1:amd64 2.4.97-1
libdrm-common 2.4.97-1
@@ -160,8 +152,6 @@
libdrm-radeon1:amd64 2.4.97-1
libdrm2:amd64 2.4.97-1
libedit2:amd64 3.1-20181209-1
-libefiboot1:amd64 37-2
-libefivar1:amd64 37-2
libegl-mesa0:amd64 18.3.6-2+deb10u1
libegl1:amd64 1.1.0-1
libegl1-mesa-dev:amd64 18.3.6-2+deb10u1
@@ -169,6 +159,7 @@
libencode-locale-perl 1.05-1
liberror-perl 0.17027-2
libestr0:amd64 0.1.10-2.1
+libevent-2.1-6:amd64 2.1.8-stable-4
libexpat1:amd64 2.2.6-2+deb10u1
libexpat1-dev:amd64 2.2.6-2+deb10u1
libext2fs2:amd64 1.44.5-1+deb10u3
@@ -181,10 +172,9 @@
libfile-fcntllock-perl 0.22-3+b5
libfile-homedir-perl 1.004-1
libfile-listing-perl 6.04-1
+libfile-stripnondeterminism-perl 1.1.2-1
libfile-which-perl 1.23-1
libfont-afm-perl 1.20-2
-libfreetype6:amd64 2.9.1-3+deb10u1
-libfuse2:amd64 2.9.9-1
libgbm1:amd64 18.3.6-2+deb10u1
libgcc-8-dev:amd64 8.3.0-6
libgcc-8-dev-arm64-cross 8.3.0-2cross1
@@ -202,19 +192,20 @@
libgles2:amd64 1.1.0-1
libgles2-mesa-dev:amd64 18.3.6-2+deb10u1
libglib2.0-0:amd64 2.58.3-2+deb10u2
+libglib2.0-data 2.58.3-2+deb10u2
libglvnd-core-dev:amd64 1.1.0-1
libglvnd-dev:amd64 1.1.0-1
libglvnd0:amd64 1.1.0-1
libglx-mesa0:amd64 18.3.6-2+deb10u1
libglx0:amd64 1.1.0-1
libgmp10:amd64 2:6.1.2+dfsg-4
+libgnutls-dane0:amd64 3.6.7-4+deb10u2
libgnutls30:amd64 3.6.7-4+deb10u2
libgomp1:amd64 8.3.0-6
libgomp1-arm64-cross 8.3.0-2cross1
libgpg-error0:amd64 1.35-1
libgpm2:amd64 1.20.7-5
libgssapi-krb5-2:amd64 1.17-3
-libhavege1:amd64 1.9.1-7
libhogweed4:amd64 3.4.1-1
libhtml-form-perl 6.03-1
libhtml-format-perl 2.12-1
@@ -235,15 +226,14 @@
libip4tc0:amd64 1.8.2-4
libip6tc0:amd64 1.8.2-4
libiptc0:amd64 1.8.2-4
-libisc-export1100:amd64 1:9.11.5.P4+dfsg-5.1
libisl19:amd64 0.20-2
libitm1:amd64 8.3.0-6
libitm1-arm64-cross 8.3.0-2cross1
+libjansson4:amd64 2.12-1
libjson-c3:amd64 0.12.1+ds-2
libjsoncpp1:amd64 1.7.4-3
libk5crypto3:amd64 1.17-3
libkeyutils1:amd64 1.6-6
-libklibc:amd64 2.0.6-1
libkmod2:amd64 26-1
libkrb5-3:amd64 1.17-3
libkrb5support0:amd64 1.17-3
@@ -252,6 +242,8 @@
libldap-common 2.4.47+dfsg-3+deb10u1
libllvm7:amd64 1:7.0.1-8
liblocale-gettext-perl 1.07-3+b4
+liblockfile-bin 1.14-1.1
+liblockfile1:amd64 1.14-1.1
liblognorm5:amd64 2.0.5-1
liblsan0:amd64 8.3.0-6
liblsan0-arm64-cross 8.3.0-2cross1
@@ -263,6 +255,7 @@
liblzma5:amd64 5.2.4-1
libmagic-mgc 1:5.35-4+deb10u1
libmagic1:amd64 1:5.35-4+deb10u1
+libmail-sendmail-perl 0.80-1
libmailtools-perl 2.18-1
libmnl0:amd64 1.0.4-2
libmount1:amd64 2.33.1-0.1
@@ -277,25 +270,25 @@
libnet-ssleay-perl 1.85-2+b1
libnetfilter-conntrack3:amd64 1.0.7-1
libnettle6:amd64 3.4.1-1
-libnewt0.52:amd64 0.52.20-8
libnfnetlink0:amd64 1.0.1-3+b1
+libnftables0:amd64 0.9.0-2
libnftnl11:amd64 1.1.2-2
libnghttp2-14:amd64 1.36.0-2+deb10u1
libnpth0:amd64 1.6-1
+libnss-systemd:amd64 241-7~deb10u3
libopengl0:amd64 1.1.0-1
libp11-kit0:amd64 0.23.15-2
+libpam-cap:amd64 1:2.25-2
libpam-modules:amd64 1.3.1-5
libpam-modules-bin 1.3.1-5
libpam-runtime 1.3.1-5
libpam-systemd:amd64 241-7~deb10u3
libpam0g:amd64 1.3.1-5
-libparted2:amd64 3.2-25
libpciaccess0:amd64 0.14-1
libpcre2-8-0:amd64 10.32-5
libpcre3:amd64 2:8.39-12
libperl5.28:amd64 5.28.1-6
libpipeline1:amd64 1.5.1-2
-libpng16-16:amd64 1.6.36-6
libpopt0:amd64 1.16-12
libprocps7:amd64 2:3.3.15-2
libprotobuf-dev:amd64 3.6.1.3-2
@@ -329,7 +322,6 @@
libsensors5:amd64 1:3.5.0-3
libsepol1:amd64 2.8-1
libsigsegv2:amd64 2.12-2
-libslang2:amd64 2.3.2-2
libsmartcols1:amd64 2.33.1-0.1
libsqlite3-0:amd64 3.27.2-3
libss2:amd64 1.44.5-1+deb10u3
@@ -340,6 +332,7 @@
libstdc++-8-dev-arm64-cross 8.3.0-2cross1
libstdc++6:amd64 8.3.0-6
libstdc++6-arm64-cross 8.3.0-2cross1
+libsys-hostname-long-perl 1.5-1
libsystemd0:amd64 241-7~deb10u3
libtasn1-6:amd64 4.13-3
libtimedate-perl 2.3000-2+deb10u1
@@ -352,6 +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
libunistring2:amd64 0.9.10-1
liburi-perl 1.76-1
libusb-1.0-0:amd64 2:1.0.22-2
@@ -411,6 +405,7 @@
libxml-sax-perl 1.00+dfsg-1
libxml-simple-perl 2.25-1
libxml2:amd64 2.9.4+dfsg1-7+b3
+libxmuu1:amd64 2:1.1.2-2+b3
libxshmfence-dev:amd64 1.3-1
libxshmfence1:amd64 1.3-1
libxtables12:amd64 1.8.2-4
@@ -420,15 +415,11 @@
libyaml-libyaml-perl 0.76+repack-1
libyaml-perl 1.27-1
libzstd1:amd64 1.3.8+dfsg-3
-linux-base 4.6
-linux-image-4.19.0-8-cloud-amd64 4.19.98-1
-linux-image-cloud-amd64 4.19+105+deb10u3
linux-libc-dev:amd64 4.19.98-1
linux-libc-dev-arm64-cross 4.19.20-1cross1
login 1:4.5-1.1
logrotate 3.14.0-4
lsb-base 10.2019051400
-lsb-release 10.2019051400
m4 1.4.18-2
make 4.2.1-1.2
man-db 2.8.5-2
@@ -437,21 +428,19 @@
mawk 1.3.3-17+b3
mesa-common-dev:amd64 18.3.6-2+deb10u1
mime-support 3.62
-mokutil 0.3.0+1538710437.fb6250f-1
mount 2.33.1-0.1
-nano 3.2-3
nasm 2.14-1
ncurses-base 6.1+20181013-2+deb10u2
ncurses-bin 6.1+20181013-2+deb10u2
+ncurses-term 6.1+20181013-2+deb10u2
net-tools 1.60+git20180626.aebd88e-1
netbase 5.6
+nftables 0.9.0-2
ninja-build 1.8.2-1
openssh-client 1:7.9p1-10+deb10u2
openssh-server 1:7.9p1-10+deb10u2
openssh-sftp-server 1:7.9p1-10+deb10u2
openssl 1.1.1d-0+deb10u2
-os-prober 1.77
-parted 3.2-25
passwd 1:4.5-1.1
patch 2.7.6-3+deb10u1
perl 5.28.1-6
@@ -460,41 +449,28 @@
perl-openssl-defaults:amd64 3
pinentry-curses 1.1.0-2
pkg-config 0.29-6
+po-debconf 1.0.21
procps 2:3.3.15-2
protobuf-compiler 3.6.1.3-2
+psmisc 23.2-1
publicsuffix 20190415.1030-1
python 2.7.16-1
-python-apt-common 1.8.4.1
-python-boto 2.44.0-1.1
-python-certifi 2018.8.24-1
-python-chardet 3.0.4-3
-python-crcmod 1.7+dfsg-1+b1
-python-google-compute-engine 1:20191210.00-g1
-python-idna 2.6-1
python-minimal 2.7.16-1
python-pip-whl 18.1-5
-python-pkg-resources 40.8.0-1
-python-requests 2.21.0-1
-python-six 1.12.0-1
-python-urllib3 1.24.1-1
python2 2.7.16-1
python2-minimal 2.7.16-1
python2.7 2.7.16-2+deb10u1
python2.7-minimal 2.7.16-2+deb10u1
python3 3.7.3-1
-python3-apt 1.8.4.1
python3-asn1crypto 0.24.0-1
python3-cffi-backend 1.12.2-1
python3-crypto 2.6.1-9+b1
python3-cryptography 2.6.1-3+deb10u2
python3-dbus 1.2.8-3
python3-dev 3.7.3-1
-python3-distro 1.3.0-1
-python3-distro-info 0.21
python3-distutils 3.7.3-1
python3-entrypoints 0.3-1
python3-gi 3.30.4-1
-python3-google-compute-engine 1:20191210.00-g1
python3-keyring 17.1.1-1
python3-keyrings.alt 3.1.1-1
python3-lib2to3 3.7.3-1
@@ -513,10 +489,7 @@
rsyslog 8.1901.0-1
sed 4.7-1
sensible-utils 0.0.12
-shim-helpers-amd64-signed 1+15+1533136590.3beb971+7
-shim-signed:amd64 1.33+15+1533136590.3beb971-7
-shim-signed-common 1.33+15+1533136590.3beb971-7
-shim-unsigned 15+1533136590.3beb971-7
+shared-mime-info 1.10-1
sudo 1.8.27-1+deb10u2
systemd 241-7~deb10u3
systemd-sysv 241-7~deb10u3
@@ -524,25 +497,18 @@
tar 1.30+dfsg-6
tzdata 2019c-0+deb10u1
ucf 3.0038+nmu1
-udev 241-7~deb10u3
-unattended-upgrades 1.11.2
util-linux 2.33.1-0.1
-vim 2:8.1.0875-5
-vim-common 2:8.1.0875-5
-vim-runtime 2:8.1.0875-5
-vim-tiny 2:8.1.0875-5
-wget 1.20.1-1.1
-whiptail 0.52.20-8
x11proto-core-dev 2018.4-4
x11proto-damage-dev 1:2018.4-4
x11proto-dev 2018.4-4
x11proto-fixes-dev 1:2018.4-4
x11proto-xext-dev 2018.4-4
x11proto-xf86vidmode-dev 2018.4-4
+xauth 1:1.0.10-1
+xdg-user-dirs 0.17-2
xorg-sgml-doctools 1:1.11-1
xtrans-dev 1.3.5-1
xutils-dev 1:7.7+5+b1
-xxd 2:8.1.0875-5
xz-utils 5.2.4-1
zlib1g:amd64 1:1.2.11.dfsg-1
zlib1g-dev:amd64 1:1.2.11.dfsg-1
diff --git a/x86_64-linux-gnu/builder_image.txt b/x86_64-linux-gnu/builder_image.txt
index 4583717..c14aef9 100644
--- a/x86_64-linux-gnu/builder_image.txt
+++ b/x86_64-linux-gnu/builder_image.txt
@@ -1 +1 @@
-sourceImage: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-10-buster-v20200210
+sourceImage: https://www.googleapis.com/compute/v1/projects/cloud-android-testing/global/images/jemoreira-build-image
diff --git a/x86_64-linux-gnu/cargo_version.txt b/x86_64-linux-gnu/cargo_version.txt
index 462d11c..02f3904 100644
--- a/x86_64-linux-gnu/cargo_version.txt
+++ b/x86_64-linux-gnu/cargo_version.txt
@@ -1,4 +1,4 @@
-cargo 1.41.0 (626f0f40e 2019-12-03)
-release: 1.41.0
-commit-hash: 626f0f40efd32e6b3dbade50cd53fdfaa08446ba
-commit-date: 2019-12-03
+cargo 1.42.0 (86334295e 2020-01-31)
+release: 1.42.0
+commit-hash: 86334295e82ef241fe5ec618d9fb612585bd7c1f
+commit-date: 2020-01-31
diff --git a/x86_64-linux-gnu/manifest.xml b/x86_64-linux-gnu/manifest.xml
index 520d565..911d47a 100644
--- a/x86_64-linux-gnu/manifest.xml
+++ b/x86_64-linux-gnu/manifest.xml
@@ -6,11 +6,11 @@
<manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver"/>
- <project groups="pdk" name="platform/external/adhd" path="third_party/adhd" revision="e65070b653154252b7c66ec983c8df842f932f77" upstream="crosvm-master"/>
- <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="ce27adbb2c89e681f291d5b78726f6247a5a8631" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/adhd" path="third_party/adhd" revision="a3e81aa1cef605f2a1b3deb4dcf3e992ec1d602e" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="768b3825d0e0b0bb920dd5233e4e6621093e1835" upstream="crosvm-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="third_party/minijail" revision="2b12228001b843327eea78230295dff9813e6b16" upstream="crosvm-master"/>
+ <project groups="pdk" name="platform/external/minijail" path="aosp/external/minijail" revision="2b12228001b843327eea78230295dff9813e6b16" upstream="crosvm-master"/>
<project groups="pdk" name="platform/external/virglrenderer" path="third_party/virglrenderer" revision="f0c2fba5827abb3634b1992855264d7fe990b89d" upstream="crosvm-master"/>
<project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="8eb7cd76622697f630a52cfcaf14a4971be21e38" upstream="crosvm-master"/>
diff --git a/x86_64-linux-gnu/rustup_show.txt b/x86_64-linux-gnu/rustup_show.txt
index 82c90e0..554cb79 100644
--- a/x86_64-linux-gnu/rustup_show.txt
+++ b/x86_64-linux-gnu/rustup_show.txt
@@ -9,6 +9,6 @@
active toolchain
----------------
-stable-x86_64-unknown-linux-gnu (overridden by '/home/cuttlefish_crosvm_builder/source/platform/crosvm/rust-toolchain')
-rustc 1.41.1 (f3e1a954d 2020-02-24)
+stable-x86_64-unknown-linux-gnu (overridden by '/source/platform/crosvm/rust-toolchain')
+rustc 1.42.0 (b8cedc004 2020-03-09)
