commit b180ab5ab072783f64f495c5b1e3b4d518a6069f
author Greg Hartman <ghartman@google.com> Thu Aug 22 11:57:41 2019 -0700
committer Greg Hartman <ghartman@google.com> Thu Aug 22 12:10:34 2019 -0700
tree 7e2ad9b335a3985c0224bd9a6be65742678b5215
parent 25c8894a2f1c314b6d4f931c762577c4f204715d

Changes to allow upstream to build for X

Test: Local build and boot with GPU
BUG: 128842306
Change-Id: I323cd124cfd520dd417d5ee56a17e150e63e924f

rebuild_gce.sh

diff --git a/rebuild_gce.sh b/rebuild_gce.sh
index 37bf788..10c3703 100755
--- a/rebuild_gce.sh
+++ b/rebuild_gce.sh
@@ -143,7 +143,8 @@
 
   # Note: depends on libepoxy
   cd "${THIRD_PARTY_ROOT}/virglrenderer"
-  ./autogen.sh --prefix=${HOME} PKG_CONFIG_PATH=${HOME}/lib/pkgconfig
+  ./autogen.sh --prefix=${HOME} PKG_CONFIG_PATH=${HOME}/lib/pkgconfig \
+    --disable-egl
   make -j install
   cp "${HOME}/lib/libvirglrenderer.so.0" "${LIB_PATH}"/
 
@@ -151,7 +152,7 @@
   cd "${PLATFORM_ROOT}/crosvm"
 
   RUSTFLAGS="-C link-arg=-Wl,-rpath,\$ORIGIN -C link-arg=-L${HOME}/lib" \
-    cargo build --features gpu
+    cargo build --features gpu,x
 
   # Save the outputs
   cp Cargo.lock "${OUT_DIR}"