From 9ad334960de98a4659c47bb02dac4b825dd85859 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 1 Sep 2021 23:29:42 -0400
Subject: [PATCH] google_pixel: Don't exclude our overlays from RRO

Change-Id: I6d51688a84797a06b2814e0e7f2cfc828807feff
---
 apps/GoogleApps.mk | 1 -
 product.mk         | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index 6e56ff6..e6ce392 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -52,4 +52,3 @@ PRODUCT_COPY_FILES += \
     vendor/google_pixel/apps/permissions/privapp-permissions-pixel.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-pixel.xml
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/google_pixel/overlays/overlay-gms
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/google_pixel/overlays/overlay-gms
diff --git a/product.mk b/product.mk
index 62ad743..636501d 100644
--- a/product.mk
+++ b/product.mk
@@ -1,8 +1,5 @@
 include vendor/google_pixel/codenames.mk
 
-## Exclude us from RRO enforcement, as it is broken at the moment
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/google_pixel
-
 ## Google Fonts
 # LineageOS already defines font_customization.xml, and there's no way to override it.
 # Therefore, on LineageOS run `repopick -f 289513` prior to every build.