summaryrefslogtreecommitdiffstats
path: root/target/product/emulator.mk
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2014-10-27 19:53:24 +0100
committerYing Wang <wangying@google.com>2014-11-19 12:17:59 -0800
commita60edd110f4e3c49f6e9d825a5de9bcbba27fa1e (patch)
tree89a4babe38d23b78dc574abd395cefc567b6f42d /target/product/emulator.mk
parent471e60d6a89ada5a9ed322d200fbe14eb07764ff (diff)
downloadbuild-a60edd110f4e3c49f6e9d825a5de9bcbba27fa1e.zip
build-a60edd110f4e3c49f6e9d825a5de9bcbba27fa1e.tar.gz
build-a60edd110f4e3c49f6e9d825a5de9bcbba27fa1e.tar.bz2
arm: Support qemu-android on generic arm targets
When building a generic arm 32-bit target, we also want to include support for the ranchu board model for the updated Android emulator based on recent upstream QEMU. Since the emulator.mk file is included by both the generic and generic_arm64 targets and already defines a PRODUCT_COPY_FILES and PRODUCT_PACKAGES, move duplicate entries from target/board/generic*/device.mk to target/product/emulator.mk. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
Diffstat (limited to 'target/product/emulator.mk')
-rw-r--r--target/product/emulator.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 62099df..295dfac 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -41,11 +41,17 @@ PRODUCT_PACKAGES += \
lights.goldfish \
gps.goldfish \
sensors.goldfish \
- e2fsck
+ e2fsck \
+ audio.primary.goldfish \
+ vibrator.goldfish \
+ power.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
+ device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc \
+ device/generic/goldfish/init.ranchu.rc:root/init.ranchu.rc \
+ device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \
+ device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc