diff options
| author | Marc Blank <mblank@google.com> | 2012-06-28 10:40:46 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-06-28 11:15:06 -0700 |
| commit | f419287f22ae44f25e1ba1f757ec33c7941bbfa8 (patch) | |
| tree | a8cc187af29703d848962acdd3f76a527b63b000 /Android.mk | |
| parent | 1c9d351b64d9e7a5befe8e508c7f98da51c8fe59 (diff) | |
| download | android_packages_apps_Email-f419287f22ae44f25e1ba1f757ec33c7941bbfa8.tar.gz android_packages_apps_Email-f419287f22ae44f25e1ba1f757ec33c7941bbfa8.tar.bz2 android_packages_apps_Email-f419287f22ae44f25e1ba1f757ec33c7941bbfa8.zip | |
DO NOT MERGE: Move emailcommon2 sources to emailcommon
Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/Android.mk b/Android.mk index 843eda77b..7a124eb7a 100644 --- a/Android.mk +++ b/Android.mk @@ -14,38 +14,42 @@ LOCAL_PATH := $(call my-dir) -# Build the Email application itself, along with its tests and the tests for the emailcommon +# Build the Email application itself, along with its tests and tests for the emailcommon # static library. All tests can be run via runtest email include $(CLEAR_VARS) -# Include res dir from chips + +# Include res dir from chips, unified, and photoviewer chips_dir := ../../../frameworks/ex/chips/res -mail_common_dir := ../../../frameworks/opt/mailcommon/res -res_dir := $(chips_dir) $(mail_common_dir) res +unified_email_dir := ../UnifiedEmail +photo_dir := ../../../frameworks/ex/photoviewer/res +res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email) +LOCAL_SRC_FILES := $(call all-java-files-under, $(unified_email_dir)/src) +LOCAL_SRC_FILES += $(call all-java-files-under, src/com/android) LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra) + LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) -LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips +# Use assets dir from UnifiedEmail +# (the default package target doesn't seem to deal with multiple asset dirs) +LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets -LOCAL_PACKAGE_NAME := Email +LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.ex.photo + +LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 guava android-common-chips android-common-photoviewer +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 -LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_PACKAGE_NAME := Email2 +LOCAL_OVERRIDES_PACKAGES := Email -LOCAL_SDK_VERSION := current +LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags -# The Emma tool analyzes code coverage when running unit tests on the -# application. This configuration line selects which packages will be analyzed, -# leaving out code which is tested by other means (e.g. static libraries) that -# would dilute the coverage results. These options do not affect regular -# production builds. -LOCAL_EMMA_COVERAGE_FILTER := +com.android.emailcommon.*,+com.android.email.*, \ - +org.apache.james.mime4j.*,+com.beetstra.jutf7.*,+org.apache.commons.io.* +LOCAL_SDK_VERSION := 16 include $(BUILD_PACKAGE) @@ -54,3 +58,4 @@ ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) # additionally, build unit tests in a separate .apk include $(call all-makefiles-under,$(LOCAL_PATH)) endif + |