diff options
author | Anton Hansson <hansson@google.com> | 2019-01-11 14:58:03 +0000 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2019-01-15 10:07:37 +0000 |
commit | b4f38deaa759cefc75790fdaffcd0f0a18c06485 (patch) | |
tree | 53777cd5c7cf962d83271bbc2cd4b0c1ad64140d | |
parent | b7d8cd1e48dc2e085bd0fca3c233948ce3bf6499 (diff) | |
download | Launcher3-b4f38deaa759cefc75790fdaffcd0f0a18c06485.tar.gz |
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
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | CleanSpec.mk | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 3945746556..1b22aeb00d 100644 --- a/Android.mk +++ b/Android.mk @@ -160,7 +160,9 @@ LOCAL_SDK_VERSION := system_current 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 b2c5266fa2..f58158f148 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -52,6 +52,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm $(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 |