aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-05-29 16:04:11 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-06-05 21:15:06 +0000
commit47acd31f571ae1eef530ad1b04894432ba7ca7d5 (patch)
tree6302f049d38cba8b96f5d189a41ea377e78a9b76
parentb2a5515585edfb0b0adbf60f99e06c0ad2dd1d75 (diff)
downloadbuild-47acd31f571ae1eef530ad1b04894432ba7ca7d5.tar.gz
Changing the default launcher and recents implementation for system build
Bug: 77490347 Test: Build and flashed system image Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
-rw-r--r--CleanSpec.mk5
-rw-r--r--target/product/core.mk2
-rw-r--r--target/product/sdk_base.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 056892317a..767726108d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -483,6 +483,11 @@ $(call add-clean-step, rm -rf $(TARGET_COMMON_OUT_ROOT)/obj_asan/JAVA_LIBRARIES/
# Remove stale init.noenforce.rc
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/gsi/init.noenforce.rc)
+# Clean up Launcher3 which has been replaced with Launcher3QuickStep
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher3)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/target/product/core.mk b/target/product/core.mk
index acbc87f351..c72bb2f265 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -42,7 +42,7 @@ PRODUCT_PACKAGES += \
KeyChain \
Keyguard \
LatinIME \
- Launcher3 \
+ Launcher3QuickStep \
ManagedProvisioning \
MtpDocumentsProvider \
PacProcessor \
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index c50d653c4f..1e5ed19281 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -23,7 +23,7 @@ PRODUCT_PACKAGES := \
Development \
Dialer \
Gallery2 \
- Launcher3 \
+ Launcher3QuickStep \
Camera2 \
librs_jni \
LiveWallpapersPicker \