Update manifest and Android.bp for aarch64 build
Test: built and tested on a rockpi board
Bug: 148642775 Clean up the crosvm build
Change-Id: I45b7af0a3d2d41eface727215e04d84734b32e51
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/Android.bp b/Android.bp
index 7e40c4e..56ab8dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,9 +67,9 @@
// Using cc_prebuilt_binary because cc_prebuild_library can't handle stem on pie
cc_prebuilt_binary {
- name: "aarch64_linux_gnu_libvirglrenderer.so.0_for_crosvm",
- srcs: ["aarch64-linux-gnu/bin/libvirglrenderer.so.0"],
- stem: "libvirglrenderer.so.0",
+ name: "aarch64_linux_gnu_libvirglrenderer.so.1_for_crosvm",
+ srcs: ["aarch64-linux-gnu/bin/libvirglrenderer.so.1"],
+ stem: "libvirglrenderer.so.1",
relative_install_path: "aarch64-linux-gnu",
defaults: ["cuttlefish_host_only"],
}
diff --git a/aarch64-linux-gnu/manifest.xml b/aarch64-linux-gnu/manifest.xml
index 077259a..0827c8c 100644
--- a/aarch64-linux-gnu/manifest.xml
+++ b/aarch64-linux-gnu/manifest.xml
@@ -6,12 +6,12 @@
<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="ced4ae2804e81b77fc3e9b15798bc93af984cd7f" upstream="crosvm-master"/>
- <project groups="pdk" name="platform/external/crosvm" path="platform/crosvm" revision="f96646779d6ce8b66d7e26654c36dc74ed1de28d" upstream="crosvm-master"/>
- <project groups="pdk" name="platform/external/libepoxy" path="third_party/libepoxy" revision="174d1194015fb352615417da636ca26d6a4829b6" upstream="crosvm-master"/>
+ <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/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/virglrenderer" path="third_party/virglrenderer" revision="4bb71f3c39031ea0ed238dacaf9349091d64394f" 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"/>
<repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks"/>
