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

Commit 1829eb17 authored by bohu's avatar bohu Committed by Anton Hansson
Browse files

emulator: base sdk_phone_x86/64 images on aosp 

BUG: 79941736

this cl only impacts emulator images

Test: lunch sdk_phone_x86; m; emulator boots
Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
(cherry picked from commit c5e25e9b)
parent dabf1a0c

target/product/sdk_phone_x86.mk

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

#



PRODUCT_PROPERTY_OVERRIDES += \

	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.4/kernel-qemu2:kernel-ranchu-64



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



# AOSP emulator images build the AOSP messaging app.

# Google API images override with the Google API app.

# See vendor/google/products/sdk_google_phone_*.mk

PRODUCT_PACKAGES += \

    messaging

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



# Overrides

PRODUCT_BRAND := Android

target/product/sdk_phone_x86_64.mk

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

#



PRODUCT_PROPERTY_OVERRIDES += \

	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.4/kernel-qemu2:kernel-ranchu



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

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



# AOSP emulator images build the AOSP messaging app.

# Google API images override with the Google API app.

# See vendor/google/products/sdk_google_phone_*.mk

PRODUCT_PACKAGES += \

    messaging

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



# Overrides

PRODUCT_BRAND := Android