Skip ab/6749736 in stage.
Merged-In: I1a7ca0b30bbb2d1b27439fba2f3eab6273482da8
Change-Id: I485ece3b8b45be5a996ce0e44ed0df841c698e76
diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk
index 1d60b00..d876f35 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 63f9dd0..2d0cb61 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 :=
