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

Commit 59d7afcc authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] emulator: factor vendor partition out of emulator.mk am: 66768530 am: 8d12ee6e 

Change-Id: I30ffe0481ebf0dc4bd72a3108caf42f702eac735
parents 4ef69f27 8d12ee6e

target/product/aosp_arm.mk

+1 −10
Original line number Diff line number Diff line
@@ -14,16 +14,7 @@ 
# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES += \

	vendor.rild.libpath=/vendor/lib/libreference-ril.so



# Note: the following lines need to stay at the beginning so that it can

# take priority  and override the rules it inherit from other mk files

# see copy file rules in core/Makefile

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu-64 \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

include device/generic/goldfish/arm32-vendor.mk



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

target/product/aosp_arm64.mk

+1 −10
Original line number Diff line number Diff line
@@ -14,21 +14,12 @@ 
# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES += \

	vendor.rild.libpath=/vendor/lib64/libreference-ril.so



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be

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



# Note: the following lines need to stay at the beginning so that it can

# take priority  and override the rules it inherit from other mk files

# see copy file rules in core/Makefile

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

include device/generic/goldfish/arm64-vendor.mk



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

target/product/aosp_x86.mk

+1 −11
Original line number Diff line number Diff line
@@ -14,17 +14,7 @@ 
# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES += \

	vendor.rild.libpath=/vendor/lib/libreference-ril.so



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be

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

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64

include device/generic/goldfish/x86-vendor.mk



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor

PRODUCT_PACKAGES += \

target/product/aosp_x86_64.mk

+1 −7
Original line number Diff line number Diff line
@@ -14,18 +14,12 @@ 
# limitations under the License.

#



PRODUCT_PROPERTY_OVERRIDES += \

	vendor.rild.libpath=/vendor/lib64/libreference-ril.so



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be

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



PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu

include device/generic/goldfish/x86_64-vendor.mk



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

target/product/emulator.mk

+4 −130
Original line number Diff line number Diff line
@@ -18,151 +18,22 @@ 
# emulator-related modules to PRODUCT_PACKAGES.

#



# Host modules

PRODUCT_PACKAGES += \





# Device modules

PRODUCT_PACKAGES += \

    egl.cfg \

    gralloc.goldfish \

    gralloc.goldfish.default \

    gralloc.ranchu \

    libGLESv1_CM_emulation \

    lib_renderControl_enc \

    libEGL_emulation \

    libGLES_android \

    libGLESv2_enc \

    libOpenglSystemCommon \

    libGLESv2_emulation \

    libGLESv1_enc \

    libEGL_swiftshader \

    libGLESv1_CM_swiftshader \

    libGLESv2_swiftshader \

    qemu-props \

    camera.goldfish \

    camera.goldfish.jpeg \

    camera.ranchu \

    camera.ranchu.jpeg \

    gatekeeper.ranchu \

    lights.goldfish \

    gps.goldfish \

    gps.ranchu \

    fingerprint.goldfish \

    sensors.goldfish \

    audio.primary.goldfish \

    audio.primary.goldfish_legacy \

    android.hardware.audio@2.0-service \

    android.hardware.wifi@1.0-service \

    vibrator.goldfish \

    power.goldfish \

    power.ranchu \

    fingerprint.ranchu \

    android.hardware.biometrics.fingerprint@2.1-service \

    sensors.ranchu \

    android.hardware.graphics.composer@2.1-impl \

    android.hardware.graphics.composer@2.1-service \

    android.hardware.graphics.allocator@2.0-service \

    android.hardware.graphics.allocator@2.0-impl \

    android.hardware.graphics.mapper@2.0-impl \

    hwcomposer.goldfish \

    hwcomposer.ranchu \

    sh_vendor \

    vintf \

    toybox_vendor \

    CarrierConfig \

    audio.primary.goldfish \

    audio.r_submix.default \

    local_time.default \

    SdkSetup



PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.broadcastradio@1.1-service \

    android.hardware.broadcastradio@1.0-impl \

    android.hardware.soundtrigger@2.0-impl



PRODUCT_PACKAGES += \

    android.hardware.keymaster@3.0-impl \

    android.hardware.keymaster@3.0-service



PRODUCT_PACKAGES += \

    android.hardware.keymaster@4.0-strongbox-service



PRODUCT_PACKAGES += \

    android.hardware.gnss@1.0-service \

    android.hardware.gnss@1.0-impl



PRODUCT_PACKAGES += \

    android.hardware.sensors@1.0-impl \

    android.hardware.sensors@1.0-service



PRODUCT_PACKAGES += \

    android.hardware.drm@1.0-service \

    android.hardware.drm@1.0-impl



PRODUCT_PACKAGES += \

    android.hardware.power@1.0-service \

    android.hardware.power@1.0-impl



PRODUCT_PACKAGES += \

    camera.device@1.0-impl \

    android.hardware.camera.provider@2.4-service \

    android.hardware.camera.provider@2.4-impl \



PRODUCT_PACKAGES += \

    android.hardware.gatekeeper@1.0-impl \

    android.hardware.gatekeeper@1.0-service



# need this for gles libraries to load properly

# after moving to /vendor/lib/

PRODUCT_PACKAGES += \

    vndk-sp



# WiFi

# WiFi: system side

PRODUCT_PACKAGES += \

	createns \

	dhcpclient \

	dhcpserver \

	execns \

	hostapd \

	ip \

	ipv6proxy \

	iw \

	wificond \

	wpa_supplicant \



PRODUCT_COPY_FILES += \

    device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \

    device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \

    device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \

    device/generic/goldfish/wifi/init.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.wifi.sh \

    device/generic/goldfish/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \

    device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \

    device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \

    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:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-goldfish.xml \

    device/generic/goldfish/data/etc/config.ini:config.ini \

    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 \

    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
@@ -171,6 +42,9 @@ PRODUCT_CHARACTERISTICS := emulator 


PRODUCT_FULL_TREBLE_OVERRIDE := true



# goldfish vendor partition configurations

$(call inherit-product, device/generic/goldfish/vendor.mk)



#watchdog tiggers reboot because location service is not

#responding, disble it for now.

#still keep it on internal master as it is still working