forked from openkylin/platform_build
Move emulator specific configurations to vendor
The moved files are all emulator specific so should reside in vendor directory/partition. This modification resolves a Launcher crash issue when GSI boots on the emulator. Directly relevant file is handheld_core_hardware.xml, which is absent from the GSI. All other files moved in this change can cause similar issues (if they stay under /system) since they aren't present on GSI, either. Bug: 67987112 Test: x86 GSI boots to home screenon with 2 emulator products, aosp_x86, and sdk_gphone_x86 on the x86 emulator (on internal master). Both aosp_x86 and aosp_x86_64 boot to home screen on the emulator. Both aosp_arm and sdk_phone_arm boot to home screen on the arm emulator. Change-Id: I2ff4f71b89d84dab322d00cf846cf06c98a1e8a7
This commit is contained in:
parent
67f4bccdbb
commit
5bf9ac508c
|
@ -116,11 +116,11 @@ PRODUCT_COPY_FILES += \
|
|||
device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \
|
||||
device/generic/goldfish/fstab.ranchu.early:root/fstab.ranchu.early \
|
||||
device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc \
|
||||
device/generic/goldfish/input/goldfish_rotary.idc:system/usr/idc/goldfish_rotary.idc \
|
||||
device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \
|
||||
device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
|
||||
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:system/etc/permissions/privapp-permissions-goldfish.xml \
|
||||
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-goldfish.xml \
|
||||
device/generic/goldfish/data/etc/config.ini:config.ini \
|
||||
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml
|
||||
frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml
|
||||
|
||||
PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
|
|||
|
||||
PRODUCT_COPY_FILES := \
|
||||
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
|
||||
|
|
|
@ -91,19 +91,19 @@ PRODUCT_COPY_FILES := \
|
|||
frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
|
||||
frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
|
||||
frameworks/base/data/sounds/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
|
||||
device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
|
||||
device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
|
||||
device/generic/goldfish/camera/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
|
||||
device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \
|
||||
device/generic/goldfish/camera/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
|
||||
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \
|
||||
frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
|
||||
frameworks/native/data/etc/android.software.autofill.xml:system/etc/permissions/android.software.autofill.xml \
|
||||
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
|
||||
device/generic/goldfish/audio_policy.conf:system/etc/audio_policy.conf
|
||||
device/generic/goldfish/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
|
||||
device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
|
||||
device/generic/goldfish/camera/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
|
||||
device/generic/goldfish/camera/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
|
||||
device/generic/goldfish/camera/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
|
||||
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \
|
||||
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
|
||||
frameworks/native/data/etc/android.software.autofill.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.autofill.xml \
|
||||
frameworks/av/media/libeffects/data/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
|
||||
device/generic/goldfish/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf
|
||||
|
||||
include $(SRC_TARGET_DIR)/product/emulator.mk
|
||||
|
||||
|
|
Loading…
Reference in New Issue