diff options
| author | keunyoung <keunyoung@google.com> | 2013-03-08 12:56:15 -0800 |
|---|---|---|
| committer | keunyoung <keunyoung@google.com> | 2013-03-11 14:34:24 -0700 |
| commit | ffad43b2b48fc43e3bb673108ce826b3093659ee (patch) | |
| tree | 2c9fb219ec7d8475190fe218fa078b451c947464 | |
| parent | 120d4765aaa0152a910c941c415d113fbe5311e4 (diff) | |
| download | mini-emulator-armv7-a-neon-ffad43b2b48fc43e3bb673108ce826b3093659ee.tar.gz | |
reflect the migration of emulator hal to device/generic/goldfish
- no longer need to check the presence as device/generic/goldfish is in PDK
- add goldfish HAL stuffs to PRODUCT_PACKAGES
Change-Id: I49c4be1de2597ada49c10616c4dcead8797e9bab
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | mini_emulator_common.mk | 24 |
2 files changed, 22 insertions, 5 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 2ed165a..d83e84f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -8,6 +8,7 @@ include device/generic/armv7-a-neon/BoardConfig.mk # Build OpenGLES emulation libraries BUILD_EMULATOR_OPENGL := true +BUILD_EMULATOR_OPENGL_DRIVER := true -BOARD_EGL_CFG := device/generic/mini-emulator-armv7-a-neon/egl.cfg +BOARD_EGL_CFG := device/generic/goldfish/opengl/system/egl/egl.cfg diff --git a/mini_emulator_common.mk b/mini_emulator_common.mk index e141959..50f48de 100644 --- a/mini_emulator_common.mk +++ b/mini_emulator_common.mk @@ -15,9 +15,25 @@ # common stuffs across mini_emulators PRODUCT_PACKAGES += \ - audio.primary.goldfish + audio.primary.goldfish \ + camera.goldfish \ + gps.goldfish \ + gralloc.goldfish \ + lights.goldfish \ + power.goldfish \ + sensors.goldfish \ + qemu-props \ + qemud \ + libGLESv1_CM_emulation \ + lib_renderControl_enc \ + libEGL_emulation \ + libGLESv2_enc \ + libOpenglSystemCommon \ + libGLESv2_emulation \ + libGLESv1_enc \ + rild + -# media_profiles and media_codecs will be moved later! PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ device/generic/mini-emulator-armv7-a-neon/init.mini-emulator.rc:root/init.goldfish.rc \ @@ -28,5 +44,5 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml) + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml |