From e5234f8f02c9900d4cd2cb788889e619d7e1ec4f Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Tue, 29 Jan 2019 10:00:48 -0500
Subject: [PATCH] Refactor frameworks-base-overlays.

Split debug packages out of frameworks-base-overlays. Add this
collection of packages to handheld_product instead of handheld_vendor
since they all have LOCAL_PRODUCT_MODULE set to true.

Bug: 118757293
Test: make
Change-Id: Ibb94bf16e6d462fc32767275c923c4128f2fd731
---
 target/product/handheld_product.mk |  4 ++++
 target/product/handheld_vendor.mk  | 12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
index 758fa9b805..0d100b267f 100644
--- a/target/product/handheld_product.mk
+++ b/target/product/handheld_product.mk
@@ -40,3 +40,7 @@ PRODUCT_PACKAGES += \
     StorageManager \
     SystemUI \
     WallpaperCropper \
+    frameworks-base-overlays
+
+PRODUCT_PACKAGES_DEBUG += \
+    frameworks-base-overlays-debug
diff --git a/target/product/handheld_vendor.mk b/target/product/handheld_vendor.mk
index dd5903883a..cb7cf741d4 100644
--- a/target/product/handheld_vendor.mk
+++ b/target/product/handheld_vendor.mk
@@ -22,20 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
 
 # /vendor packages
 PRODUCT_PACKAGES += \
-    AccentColorBlackOverlay \
-    AccentColorGreenOverlay \
-    AccentColorPurpleOverlay \
     audio.primary.default \
-    DisplayCutoutEmulationCornerOverlay \
-    DisplayCutoutEmulationDoubleOverlay \
-    DisplayCutoutEmulationTallOverlay \
-    FontNotoSerifSourceOverlay \
-    IconShapeRoundedRectOverlay \
-    IconShapeSquircleOverlay \
-    IconShapeTeardropOverlay \
     local_time.default \
     power.default \
     vibrator.default \
 
-PRODUCT_PACKAGES_DEBUG += \
-    frameworks-base-overlays \