From 82c0e3e2683dda88bcf66c0900966d79c26515a8 Mon Sep 17 00:00:00 2001
From: Jeongik Cha <jeongik@google.com>
Date: Wed, 5 Feb 2020 16:39:00 +0900
Subject: [PATCH] Move packages from *_product.mk to *_system_ext.mk

These apps have been moved from product to system_ext.
Accordingly, they needs to be moved in definition mk files.

Bug: 137908189
Test: m
Change-Id: I0aba1343b0342887f4bc5bc1cff47f96d4803214
---
 target/product/handheld_product.mk     | 6 ------
 target/product/handheld_system_ext.mk  | 6 ++++++
 target/product/telephony_product.mk    | 2 --
 target/product/telephony_system_ext.mk | 2 ++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
index cac2a558a7..2199c570a0 100644
--- a/target/product/handheld_product.mk
+++ b/target/product/handheld_product.mk
@@ -29,17 +29,11 @@ PRODUCT_PACKAGES += \
     DeskClock \
     Gallery2 \
     LatinIME \
-    Launcher3QuickStep \
     Music \
     OneTimeInitializer \
     preinstalled-packages-platform-handheld-product.xml \
-    Provision \
     QuickSearchBox \
-    Settings \
     SettingsIntelligence \
-    StorageManager \
-    SystemUI \
-    WallpaperCropper \
     frameworks-base-overlays
 
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/target/product/handheld_system_ext.mk b/target/product/handheld_system_ext.mk
index bda4be672b..d935fbfddf 100644
--- a/target/product/handheld_system_ext.mk
+++ b/target/product/handheld_system_ext.mk
@@ -22,3 +22,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
 
 # /system_ext packages
 PRODUCT_PACKAGES += \
+    Launcher3QuickStep \
+    Provision \
+    Settings \
+    StorageManager \
+    SystemUI \
+    WallpaperCropper \
diff --git a/target/product/telephony_product.mk b/target/product/telephony_product.mk
index a4c7e31f54..3ec954fe9e 100644
--- a/target/product/telephony_product.mk
+++ b/target/product/telephony_product.mk
@@ -19,6 +19,4 @@
 
 # /product packages
 PRODUCT_PACKAGES += \
-    CarrierConfig \
     Dialer \
-    EmergencyInfo \
diff --git a/target/product/telephony_system_ext.mk b/target/product/telephony_system_ext.mk
index 1b9ee98759..f81a607f63 100644
--- a/target/product/telephony_system_ext.mk
+++ b/target/product/telephony_system_ext.mk
@@ -19,3 +19,5 @@
 
 # /system_ext packages
 PRODUCT_PACKAGES += \
+    CarrierConfig \
+    EmergencyInfo \