summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2011-12-13 10:12:27 -0800
committerMindy Pereira <mindyp@google.com>2011-12-13 10:24:52 -0800
commit1a73ea8bc1b08ff4e7baac515ed54a15de13ffe2 (patch)
treeebb121487dcdce3625f9bd782aa07e9f4507e72c /Android.mk
parent0b2aaf43159dbb2d4627e687c21b226b6d61a5a1 (diff)
downloadandroid_packages_apps_UnifiedEmail-1a73ea8bc1b08ff4e7baac515ed54a15de13ffe2.tar.gz
android_packages_apps_UnifiedEmail-1a73ea8bc1b08ff4e7baac515ed54a15de13ffe2.tar.bz2
android_packages_apps_UnifiedEmail-1a73ea8bc1b08ff4e7baac515ed54a15de13ffe2.zip
Move mailcommon code to our new unified code base.
Change-Id: I1cf861371a54bb9af97b1952af8e7a44c2856f5b
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk22
1 files changed, 12 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index aebe60484..9e15e82aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,30 +10,30 @@ res_dirs := $(chips_dir) $(mail_common_dir) res
$(shell rm -f $(LOCAL_PATH)/chips)
$(shell rm -f $(LOCAL_PATH)/mailcommon)
+
+
##################################################
-# Build APK
+# Build Static Lib
include $(CLEAR_VARS)
-LOCAL_PACKAGE_NAME := UnifiedEmail
+src_dirs := src-mailcommon
+LOCAL_MODULE := mail-common
-LOCAL_STATIC_JAVA_LIBRARIES := mail-common
LOCAL_STATIC_JAVA_LIBRARIES := android-common-chips
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \
$(call all-logtags-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) $(LOCAL_PATH)/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-
-include $(BUILD_PACKAGE)
+include $(BUILD_STATIC_JAVA_LIBRARY)
##################################################
-# Build Static Lib
+# Build APK
include $(CLEAR_VARS)
-LOCAL_MODULE := unified-email
+src_dirs := src
+LOCAL_PACKAGE_NAME := UnifiedEmail
LOCAL_STATIC_JAVA_LIBRARIES := mail-common
LOCAL_STATIC_JAVA_LIBRARIES := android-common-chips
@@ -42,5 +42,7 @@ LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \
$(call all-logtags-files-under, $(src_dirs))
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) $(LOCAL_PATH)/res
+LOCAL_AAPT_FLAGS := --auto-add-overlay
-include $(BUILD_STATIC_JAVA_LIBRARY) \ No newline at end of file
+include $(BUILD_PACKAGE)