diff options
| author | Philip Chen <philipchen@google.com> | 2023-01-26 16:16:21 -0800 |
|---|---|---|
| committer | Philip Chen <philipchen@google.com> | 2023-01-31 00:29:15 +0000 |
| commit | 1edb427ce1238a93e99b5f03b9aeba5ff6710488 (patch) | |
| tree | fedfecbadda17b47d268ffebe3dba53689641654 | |
| parent | 8106896f2119bf76b3c98e55095778f6cb7bc0de (diff) | |
| download | car-1edb427ce1238a93e99b5f03b9aeba5ff6710488.tar.gz | |
Apply AAOS baseline to AOSP car emulators
Apply AAOS baseline (car_system.mk, car_system_ext.mk, car_product.mk,
car_vendor.mk) to car_sdk_arm64, car_sdk_x86_64, and car_sdk_md_x86_64
(directly or indirectly).
Meanwhile, we set PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to strict
for car_sdk_arm64 and car_sdk_x86_64, so it is no longer allowed to add
device-specific changes to the system partition of those two devices.
We temporarily set PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false
for car_sdk_md_x86_64, since some MD-related modules are currently
installed to the system partition. We'll fix it shortly.
Lastly, since we are probably not using car_sdk_arm and car_sdk_x86,
leave them unchanged for now.
Bug: 245417855
Test: build and launch car_sdk_x86_64
Change-Id: I5ac818b4297f45772fd28342042e499bfee32bee
| -rw-r--r-- | sdk_car_arm64.mk | 29 | ||||
| -rw-r--r-- | sdk_car_md_x86_64.mk | 4 | ||||
| -rw-r--r-- | sdk_car_x86_64.mk | 29 |
3 files changed, 58 insertions, 4 deletions
diff --git a/sdk_car_arm64.mk b/sdk_car_arm64.mk index 41ed1b2..8b2dad5 100644 --- a/sdk_car_arm64.mk +++ b/sdk_car_arm64.mk @@ -15,8 +15,33 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_arm64.mk) +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/core_64_bit.mk) +$(call inherit-product, packages/services/Car/car_product/build/car_generic_system.mk) + +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict + +# +# All components inherited here go to system_ext image +# +$(call inherit-product, packages/services/Car/car_product/build/car_system_ext.mk) + +# +# All components inherited here go to product image +# +$(call inherit-product, device/generic/car/emulator/car_emulator_product.mk) + +# +# All components inherited here go to vendor image +# +$(call inherit-product, device/generic/car/emulator/car_emulator_vendor.mk) +$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm64/device.mk) EMULATOR_VENDOR_NO_SOUND := true PRODUCT_NAME := sdk_car_arm64 diff --git a/sdk_car_md_x86_64.mk b/sdk_car_md_x86_64.mk index 6929a62..5591261 100644 --- a/sdk_car_md_x86_64.mk +++ b/sdk_car_md_x86_64.mk @@ -54,6 +54,10 @@ PRODUCT_PACKAGES += \ $(call inherit-product, device/generic/car/sdk_car_x86_64.mk) +# TODO(b/266978709): Set it to true after cleaning up the system partition +# changes from this makefile +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false + PRODUCT_NAME := sdk_car_md_x86_64 PRODUCT_DEVICE := emulator_car_x86_64 PRODUCT_BRAND := Android diff --git a/sdk_car_x86_64.mk b/sdk_car_x86_64.mk index f5aa46d..79a3ce2 100644 --- a/sdk_car_x86_64.mk +++ b/sdk_car_x86_64.mk @@ -15,8 +15,33 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_x86_64.mk) +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/core_64_bit.mk) +$(call inherit-product, packages/services/Car/car_product/build/car_generic_system.mk) + +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict + +# +# All components inherited here go to system_ext image +# +$(call inherit-product, packages/services/Car/car_product/build/car_system_ext.mk) + +# +# All components inherited here go to product image +# +$(call inherit-product, device/generic/car/emulator/car_emulator_product.mk) + +# +# All components inherited here go to vendor image +# +$(call inherit-product, device/generic/car/emulator/car_emulator_vendor.mk) +$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk) EMULATOR_VENDOR_NO_SOUND := true PRODUCT_NAME := sdk_car_x86_64 |