am 276a543e: am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"

* commit '276a543e71e139dfc086c955df9686e53ea15c5a':
  arm: Support qemu-android on generic arm targets
This commit is contained in:
Ying Wang 2014-11-20 18:11:29 +00:00 committed by Android Git Automerger
commit f679a480c1
3 changed files with 8 additions and 17 deletions

View File

@ -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

View File

@ -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)

View File

@ -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