diff options
| author | Ying Wang <wangying@android.com> | 2014-11-20 17:27:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 17:27:35 +0000 |
| commit | 276a543e71e139dfc086c955df9686e53ea15c5a (patch) | |
| tree | 8c69b6e4d12556a1d69cd41b0aeba76abbfbd182 | |
| parent | a4fa3d601f24621481daf199bd895cbe8987f272 (diff) | |
| parent | ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96 (diff) | |
| download | build-276a543e71e139dfc086c955df9686e53ea15c5a.zip build-276a543e71e139dfc086c955df9686e53ea15c5a.tar.gz build-276a543e71e139dfc086c955df9686e53ea15c5a.tar.bz2 | |
am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"
* commit 'ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96':
arm: Support qemu-android on generic arm targets
| -rw-r--r-- | target/board/generic/device.mk | 5 | ||||
| -rw-r--r-- | target/board/generic_arm64/device.mk | 10 | ||||
| -rw-r--r-- | target/product/emulator.mk | 10 |
3 files changed, 8 insertions, 17 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index 06a7d8a..e56a4d1 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -30,8 +30,3 @@ PRODUCT_COPY_FILES := \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - power.goldfish \ - vibrator.goldfish diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 62dfa1b..9647a4e 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -30,16 +30,6 @@ PRODUCT_COPY_FILES := \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml -# The ranchu configuration files are needed to run under qemu-android -PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ - 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) - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - vibrator.goldfish - # Adjust the Dalvik heap to be appropriate for a tablet. $(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk) $(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk) 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 |