From b7aa96bf8e5cb35fe5c517d62b6f7fca0a5d9539 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Tue, 2 Mar 2010 14:09:55 -0500
Subject: [PATCH] Switch to Launcher2 for all builds.

Change-Id: I0a0af777bc290224c72511abfbc8ed60f8ef2174
---
 cleanspec.mk              | 1 +
 target/product/core.mk    | 2 +-
 target/product/generic.mk | 1 +
 target/product/sdk.mk     | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cleanspec.mk b/cleanspec.mk
index d1f937491..6151fd184 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -155,6 +155,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Music*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Music*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/target/product/core.mk b/target/product/core.mk
index 2eb1030af..d8962ea20 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -28,7 +28,7 @@ PRODUCT_PACKAGES := \
     framework-res \
     Browser \
     Contacts \
-    Launcher \
+    Home \
     HTMLViewer \
     Phone \
     ApplicationsProvider \
diff --git a/target/product/generic.mk b/target/product/generic.mk
index ee125e41b..c12f1c622 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -29,6 +29,7 @@ PRODUCT_PACKAGES := \
     DrmProvider \
     Email \
     LatinIME \
+    Launcher2 \
     Mms \
     Music \
     Provision \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 39230195e..ccf7ed1bb 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -27,7 +27,7 @@ PRODUCT_PACKAGES := \
 	Fallback \
 	Gallery \
 	GPSEnable \
-	Launcher \
+	Launcher2 \
 	Music \
 	Mms \
 	Settings \