summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2011-06-15 19:35:15 -0700
committerMindy Pereira <mindyp@google.com>2011-06-16 17:41:04 -0700
commit87763f0ae851c76d5e7cf672a6e3acf21705549c (patch)
treed6013744b6587647ec007319623ad5fdefe3010f /Android.mk
parentb40bdb17dfd9cf2972d42aab8b2d20c9c1291acb (diff)
downloadandroid_packages_apps_Email-87763f0ae851c76d5e7cf672a6e3acf21705549c.tar.gz
android_packages_apps_Email-87763f0ae851c76d5e7cf672a6e3acf21705549c.tar.bz2
android_packages_apps_Email-87763f0ae851c76d5e7cf672a6e3acf21705549c.zip
Integrate chips into Email.
Change-Id: Ice037a55a169037f725a667fad7714c7e9580b86
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 8dd6784d8..d586615e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,12 +18,17 @@ LOCAL_PATH := $(call my-dir)
# static library. All tests can be run via runtest email
include $(CLEAR_VARS)
+# Include res dir from chips
+chips_dir := ../../../frameworks/ex/chips/res
+res_dir := $(chips_dir) res
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email)
LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra)
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips
LOCAL_PACKAGE_NAME := Email