commit 87763f0ae851c76d5e7cf672a6e3acf21705549c
author Mindy Pereira <mindyp@google.com> Wed Jun 15 19:35:15 2011 -0700
committer Mindy Pereira <mindyp@google.com> Thu Jun 16 17:41:04 2011 -0700
tree d6013744b6587647ec007319623ad5fdefe3010f
parent b40bdb17dfd9cf2972d42aab8b2d20c9c1291acb

Integrate chips into Email.

Change-Id: Ice037a55a169037f725a667fad7714c7e9580b86

Android.mk

diff --git a/Android.mk b/Android.mk
index 8dd6784..d586615 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,12 +18,17 @@
 # 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