diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 18:10:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 18:10:55 +0000 |
| commit | 29e9270e0650ccede40cf64378880e9fda7138fe (patch) | |
| tree | 4ef5840b339eb3d9124d80d43203b4988029a332 | |
| parent | 8b4b890961714c9afd517544d12ba573066f8fe9 (diff) | |
| parent | 6ba5d6bde42998b8457cb8c96f836c9e359ebc0c (diff) | |
| download | device_google_car-29e9270e0650ccede40cf64378880e9fda7138fe.tar.gz device_google_car-29e9270e0650ccede40cf64378880e9fda7138fe.tar.bz2 device_google_car-29e9270e0650ccede40cf64378880e9fda7138fe.zip | |
DO NOT MERGE: Add coral_car and crosshatch_car to Q am: 6ba5d6bde4
Change-Id: Ib475dfb36e3f42065767706af0b9cbe1ca9101f5
| -rw-r--r-- | coral_car/aosp_coral_car.mk | 21 | ||||
| -rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 21 |
2 files changed, 4 insertions, 38 deletions
diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk index cc5b8b9..4ced505 100644 --- a/coral_car/aosp_coral_car.mk +++ b/coral_car/aosp_coral_car.mk @@ -20,26 +20,9 @@ DEVICE_FRAMEWORK_MANIFEST_FILE += device/google_car/coral_car/manifest.xml # 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) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk) -# mainline_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *' -# but this breaks coral_car. So undo it here. -PRODUCT_ENFORCE_RRO_TARGETS := - -# Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := - - -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) +PRODUCT_ENFORCE_RRO_TARGETS := * # Auto modules PRODUCT_PACKAGES += \ diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk index a51c5d3..2c41a0f 100644 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ b/crosshatch_car/aosp_crosshatch_car.mk @@ -20,26 +20,9 @@ DEVICE_FRAMEWORK_MANIFEST_FILE += device/google_car/crosshatch_car/manifest.xml # 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) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk) -# mainline_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *' -# but this breaks crosshatch_car. So undo it here. -PRODUCT_ENFORCE_RRO_TARGETS := - -# Enable mainline checking -# TODO(b/138706293): Enable mainline checking later -# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) +PRODUCT_ENFORCE_RRO_TARGETS := * # Auto modules PRODUCT_PACKAGES += \ |