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