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

Commit 1dd2190c authored by huans's avatar huans Committed by android-build-merger
Browse files

Merge "Add missing emulator vendor contents for treblizing aosp_$arch" into pi-dev 

am: 5b870d15

Change-Id: I62475d640051c3b38eac44c805aee3ea5e3cb31f
parents e5f8747d 5b870d15

target/product/aosp_arm64.mk

+1 −2
Original line number Diff line number Diff line
@@ -42,12 +42,11 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_PACKAGES += \

    vr_hwc



$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true

target/product/aosp_x86_64.mk

+1 −2
Original line number Diff line number Diff line
@@ -39,12 +39,11 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_PACKAGES += \

    vr_hwc



$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true

target/product/emulator.mk

+21 −2
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ PRODUCT_PACKAGES += \ 
    sh_vendor \

    vintf \

    toybox_vendor \

    CarrierConfig

    CarrierConfig \

    audio.primary.goldfish \

    audio.r_submix.default \

    local_time.default \

    SdkSetup



PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-impl \
@@ -142,7 +146,22 @@ PRODUCT_COPY_FILES += \ 
    device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \

    device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \

    device/generic/goldfish/wifi/WifiConfigStore.xml:data/misc/wifi/WifiConfigStore.xml \

    frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml

    frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \

    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.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \

    frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.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





PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay

target/product/full.mk

+1 −2
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



# Overrides

PRODUCT_NAME := full

PRODUCT_DEVICE := generic

target/product/full_x86.mk

+1 −2
Original line number Diff line number Diff line
@@ -23,11 +23,10 @@ 
# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB



$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)



include $(SRC_TARGET_DIR)/product/emulator.mk



ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif