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

Commit a3daf2e2 authored by bohu's avatar bohu
Browse files

emulator: convert sdk_phone_x86 and 64 to CSI

BUG: 134444564
Change-Id: I88a7bc9ac0eb7cd06cce1f10e6f55a3e4c2c27ea
parent 8206233e
Loading
Loading
Loading
Loading
+23 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,29 @@
# limitations under the License.
# limitations under the License.
#
#
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
PRODUCT_USE_DYNAMIC_PARTITIONS := true

#
# All components inherited here go to system image
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)

# Enable mainline checking for excat this product name
ifeq (sdk_phone_x86,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif

#
# All components inherited here go to product image
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)

#
# All components inherited here go to vendor image
#
$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)


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


+26 −1
Original line number Original line Diff line number Diff line
@@ -14,8 +14,33 @@
# limitations under the License.
# limitations under the License.
#
#
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
PRODUCT_USE_DYNAMIC_PARTITIONS := true


$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
#
# All components inherited here go to system image
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)

# Enable mainline checking for excat this product name
ifeq (sdk_phone_x86_64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif

PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
    root/init.zygote64_32.rc \

#
# All components inherited here go to product image
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)

#
# All components inherited here go to vendor image
#
$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)


# Define the host tools and libs that are parts of the SDK.
# Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk
-include sdk/build/product_sdk.mk