Move the RRO flags to the phone target
This is needed to make the auto build work
Test: auto builds, boots
BUG: 110695415
Change-Id: Ibd1fb1820ac40482691da060ec61b7dc557ce89a
diff --git a/shared/device.mk b/shared/device.mk
index bed1460..6403792 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -18,8 +18,6 @@
PRODUCT_SHIPPING_API_LEVEL := 26
-PRODUCT_ENFORCE_RRO_TARGETS := framework-res
-
# Explanation of specific properties:
# debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138
# ro.opengles.version OpenGLES 2.0
@@ -95,8 +93,6 @@
libGLESv2_swiftshader \
DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
-
PRODUCT_AAPT_CONFIG := normal large xlarge hdpi xhdpi
# PRODUCT_AAPT_PREF_CONFIG is intentionally not set to pick up every density resources.
diff --git a/shared/phone/device.mk b/shared/phone/device.mk
index 440e3e2..5527e24 100644
--- a/shared/phone/device.mk
+++ b/shared/phone/device.mk
@@ -44,5 +44,8 @@
PRODUCT_COPY_FILES += \
device/google/cuttlefish/shared/config/apns-conf.xml:system/etc/apns-conf.xml \
device/google/cuttlefish/shared/config/spn-conf.xml:system/etc/spn-conf.xml \
- frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
+ frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+# These flags are important for the GSI, but break auto
+PRODUCT_ENFORCE_RRO_TARGETS := framework-res
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
