Land crosvm and custom libraries in the image
BUG: 128875279
Test: Built pie-cuttlefish-testing, booted remotely with crosvm (no gpu)
Change-Id: I22279610ea5fbd8ac3967988eec52122ceb87dfe
(cherry picked from commit 9a1fd604e086fc5e49edcce6fa63783a3b53e5dc)
diff --git a/host_package.mk b/host_package.mk
index d6c6c3c..7d41df3 100644
--- a/host_package.mk
+++ b/host_package.mk
@@ -54,25 +54,29 @@
cuttlefish_net_tests \
cvd_host_shared_libraries := \
- libbase \
- vsoc_lib \
- libcuttlefish_fs \
- cuttlefish_auto_resources \
- libcuttlefish_strings \
- libcuttlefish_utils \
- cuttlefish_tcp_socket \
- cuttlefish_net \
- liblog \
- libnl \
- libc++ \
- libicuuc-host \
- libicui18n-host \
- libandroidicu-host \
- libopus \
- libvirglrenderer_cuttlefish \
- libEGL_swiftshader \
- libGLESv1_CM_swiftshader \
- libGLESv2_swiftshader \
+ libbase.so \
+ vsoc_lib.so \
+ libcuttlefish_fs.so \
+ cuttlefish_auto_resources.so \
+ libcuttlefish_strings.so \
+ libcuttlefish_utils.so \
+ cuttlefish_tcp_socket.so \
+ cuttlefish_net.so \
+ liblog.so \
+ libnl.so \
+ libc++.so \
+ libicuuc-host.so \
+ libicui18n-host.so \
+ libandroidicu-host.so \
+ libopus.so \
+ libvirglrenderer_cuttlefish.so \
+ libEGL_swiftshader.so \
+ libGLESv1_CM_swiftshader.so \
+ libGLESv2_swiftshader.so \
+ crosvm/libepoxy.so.0 \
+ crosvm/libgbm.so.1 \
+ crosvm/libminijail.so \
+ crosvm/libvirglrenderer.so.0 \
cvd_host_configs := \
@@ -83,7 +87,7 @@
cvd_host_package_files := \
$(addprefix config/,$(cvd_host_configs)) \
$(addprefix $(bin_path)/,$(cvd_host_executables)) \
- $(addprefix $(lib_path)/,$(addsuffix .so,$(cvd_host_shared_libraries))) \
+ $(addprefix $(lib_path)/,$(cvd_host_shared_libraries)) \
$(foreach test,$(cvd_host_tests), ${tests_path}/$(test)/$(test)) \
$(cvd_host_package_tar): PRIVATE_FILES := $(cvd_host_package_files)