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

Change-Id: I216a2c4d897639ffe5cb9e6ba633ae78d8a5666b
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