From 47acd31f571ae1eef530ad1b04894432ba7ca7d5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 29 May 2018 16:04:11 -0700
Subject: Changing the default launcher and recents implementation for system
 build

Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
---
 CleanSpec.mk               | 5 +++++
 target/product/core.mk     | 2 +-
 target/product/sdk_base.mk | 2 +-
 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 \
-- 
cgit v1.2.3