Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6113f0 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "arm: Support qemu-android on generic arm targets"

parents aecf9022 a60edd11

target/board/generic/device.mk

+0 −5
Original line number Diff line number Diff line
@@ -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

target/board/generic_arm64/device.mk

+0 −10
Original line number Diff line number Diff line
@@ -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)

target/product/emulator.mk

+8 −2
Original line number Diff line number Diff line
@@ -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