Rename mainline_system(.*).mk to generic_system(.*).mk am: 1a595e0157
Original change: https://android-review.googlesource.com/c/device/google_car/+/1413371
Change-Id: I0d44970326f4c8391459d98140f817235816759c
diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk
index cc5b8b9..43e6fe6 100644
--- a/coral_car/aosp_coral_car.mk
+++ b/coral_car/aosp_coral_car.mk
@@ -20,9 +20,9 @@
# 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)
-# mainline_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *'
+# generic_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *'
# but this breaks coral_car. So undo it here.
PRODUCT_ENFORCE_RRO_TARGETS :=
diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk
index a51c5d3..8c73595 100644
--- a/crosshatch_car/aosp_crosshatch_car.mk
+++ b/crosshatch_car/aosp_crosshatch_car.mk
@@ -20,9 +20,9 @@
# 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)
-# mainline_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *'
+# generic_system.mk sets 'PRODUCT_ENFORCE_RRO_TARGETS := *'
# but this breaks crosshatch_car. So undo it here.
PRODUCT_ENFORCE_RRO_TARGETS :=
