From d4308f800a62790011f493030982cab5d17ab3a5 Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Wed, 4 Apr 2012 12:05:28 -0700
Subject: [PATCH] Fix build

Change-Id: I66a1e49ee5c84342e056fbdba23b0c83039812c3
---
 CleanSpec.mk                  | 3 +++
 email2/Android.mk             | 9 ++++++++-
 email2/emailcommon/Android.mk | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6c35ea49e..f62280c72 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -66,6 +66,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermedi
 $(call add-clean-step, rm -rf $(OUT_DIR)/out/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/out/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/email2/Android.mk b/email2/Android.mk
index 9a3bda1ae..4f7a49f42 100644
--- a/email2/Android.mk
+++ b/email2/Android.mk
@@ -40,7 +40,7 @@ LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 guava android-common-chips
 
 LOCAL_PACKAGE_NAME := Email2
 LOCAL_OVERRIDES_PACKAGES := Email
@@ -50,3 +50,10 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
+
+# only include rules to build other stuff for the original package, not the derived package.
+ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
+# additionally, build unit tests in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
+
diff --git a/email2/emailcommon/Android.mk b/email2/emailcommon/Android.mk
index cd70309ca..64a5a2dac 100644
--- a/email2/emailcommon/Android.mk
+++ b/email2/emailcommon/Android.mk
@@ -28,7 +28,7 @@ imported_unified_email_files := \
         $(unified_email_src_dir)/com/android/mail/utils/LoggingInputStream.java \
         $(unified_email_src_dir)/com/android/mail/providers/UIProvider.java
 
-LOCAL_MODULE := com.android.emailcommon
+LOCAL_MODULE := com.android.emailcommon2
 LOCAL_STATIC_JAVA_LIBRARIES := guava android-common
 LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
 LOCAL_SRC_FILES += \