commit cf740b645cc2860a6194d8c1c742d248004a7063
author Anton Hansson <hansson@google.com> Tue Jan 15 13:23:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 15 13:23:15 2019 +0000
tree 53777cd5c7cf962d83271bbc2cd4b0c1ad64140d
parent b7d8cd1e48dc2e085bd0fca3c233948ce3bf6499
parent b4f38deaa759cefc75790fdaffcd0f0a18c06485

Merge "Move Launcher3QuickStep to /product"

Android.mk

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
 

CleanSpec.mk

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