Merge "Enforce /system module RRO for mainline products" am: c578262e37 am: fc810895ec
am: 86dc21bddf

Change-Id: If26dc880e0bfc4efee96630f02ece8287ce8767a
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 43bc45f..721f5d9 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -108,6 +108,8 @@
 PRODUCT_PACKAGES += \
     com.android.apex.cts.shim.v1_prebuilt
 
+PRODUCT_ENFORCE_RRO_TARGETS := *
+
 PRODUCT_NAME := mainline_system
 PRODUCT_BRAND := generic