Move Launcher3QuickStep to /product
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.
Also make it depend on its privapp permission grants.
Bug: 122353713
Test: boot aosp_arm64 emulator
Change-Id: Id21e610844c4001e40456263bcb3b4b3fde75962
diff --git a/Android.mk b/Android.mk
index 3945746..1b22aeb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -160,7 +160,9 @@
LOCAL_MIN_SDK_VERSION := 26
LOCAL_PACKAGE_NAME := Launcher3QuickStep
LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b2c5266..f58158f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3QuickStep)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST