Add module names to emulator PRODUCT_PACKAGES.
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 582ca64..1dcdc60 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -34,3 +34,25 @@
lib64GLES_CM_translator \
lib64GLES_V2_translator \
lib64EGL_translator
+
+PRODUCT_PACKAGES += \
+ egl.cfg \
+ gles_emul.cfg \
+ libGLESv1_CM_emul \
+ libGLESv2_emul \
+ libEGL_emul \
+ libut_rendercontrol_enc \
+ gralloc.goldfish \
+ libGLESv1_CM_emulation \
+ lib_renderControl_enc \
+ libEGL_emulation \
+ libGLESv2_enc \
+ libOpenglSystemCommon \
+ libGLESv2_emulation \
+ libGLESv1_enc \
+ qemu-props \
+ qemud \
+ camera.goldfish \
+ lights.goldfish \
+ gps.goldfish \
+ sensors.goldfish
diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk
index f0d4232..a492774 100644
--- a/target/product/vbox_x86.mk
+++ b/target/product/vbox_x86.mk
@@ -25,6 +25,12 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk)
+PRODUCT_PACKAGES += \
+ camera.vbox_x86 \
+ lights.vbox_x86 \
+ gps.vbox_x86 \
+ sensors.vbox_x86
+
PRODUCT_NAME := vbox_x86
PRODUCT_DEVICE := vbox_x86
PRODUCT_MODEL := Full Android on x86 VirtualBox
