diff options
| author | Ying Wang <wangying@google.com> | 2013-03-07 17:58:32 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-03-07 18:00:03 -0800 |
| commit | 4781e30a96f5b0251b8c090351ff8aa20aeddf0d (patch) | |
| tree | ca42f574512d50844f62e55126ab2ccd229d8c33 /target | |
| parent | c08eceee8e09a5bd4414d307792712adae741e4e (diff) | |
| parent | de949b11afb58a343178a7eac9c2ca0860f7405f (diff) | |
| download | build-4781e30a96f5b0251b8c090351ff8aa20aeddf0d.zip build-4781e30a96f5b0251b8c090351ff8aa20aeddf0d.tar.gz build-4781e30a96f5b0251b8c090351ff8aa20aeddf0d.tar.bz2 | |
resolved conflicts for merge of de949b11 to jb-mr2-dev
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/emulator.mk | 58 | ||||
| -rw-r--r-- | target/product/vbox_x86.mk | 6 |
2 files changed, 47 insertions, 17 deletions
diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 018e228..7eaf982 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -15,29 +15,53 @@ # # This file is included by other product makefiles to add all the -# emulator-related host modules to PRODUCT_PACKAGES. +# emulator-related modules to PRODUCT_PACKAGES. # +# Host modules PRODUCT_PACKAGES += \ - emulator \ - emulator-x86 \ - emulator-arm \ - emulator-mips \ - emulator64-x86 \ - emulator64-arm \ - emulator64-mips \ - libOpenglRender \ - libGLES_CM_translator \ - libGLES_V2_translator \ - libEGL_translator \ - lib64OpenglRender \ - lib64GLES_CM_translator \ - lib64GLES_V2_translator \ - lib64EGL_translator + emulator \ + emulator-x86 \ + emulator-arm \ + emulator-mips \ + emulator64-x86 \ + emulator64-arm \ + emulator64-mips \ + libOpenglRender \ + libGLES_CM_translator \ + libGLES_V2_translator \ + libEGL_translator \ + lib64OpenglRender \ + lib64GLES_CM_translator \ + lib64GLES_V2_translator \ + lib64EGL_translator + +# Device modules +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 + PRODUCT_COPY_FILES += \ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \ device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \ device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \ device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc - 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 @@ endif $(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 |