diff options
| author | JaeMan Park <jaeman@google.com> | 2020-09-29 09:48:17 +0900 |
|---|---|---|
| committer | JaeMan Park <jaeman@google.com> | 2020-09-29 09:48:17 +0900 |
| commit | e3a3578c5e98e3500ce1db7fbb414a29073fa1c9 (patch) | |
| tree | fd8014498a3c5dc410d10b4515f0a465301b19e7 | |
| parent | ff67912454c4b2b0336f999f0e5fb8220a427a88 (diff) | |
| download | google_car-e3a3578c5e98e3500ce1db7fbb414a29073fa1c9.tar.gz | |
Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.
Bug: 160649682
Test: lunch aosp_sunfish_car && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
| -rw-r--r-- | common/pre_google_car.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk index ee1b595..a014981 100644 --- a/common/pre_google_car.mk +++ b/common/pre_google_car.mk @@ -20,7 +20,7 @@ DEVICE_FRAMEWORK_MANIFEST_FILE += device/google_car/common/manifest.xml -# mainline_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *' +# generic_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *' # but this breaks phone_car. So undo it here. PRODUCT_ENFORCE_RRO_TARGETS := @@ -30,7 +30,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := # 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/generic_system.mk) # # All components inherited here go to system_ext image |