summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAlan Lau <alanlau@google.com>2014-03-06 14:53:14 -0800
committerAlan Lau <alanlau@google.com>2014-03-27 12:26:30 -0700
commit15490239c82cdb4765e87e926c8c1945adedd1ed (patch)
treec72f3cf43455596dab691bfe2dcac8a909af7e21 /Android.mk
parent5506369d57ffff90cbda613c561f5c03df6a4fd1 (diff)
downloadandroid_packages_apps_UnifiedEmail-15490239c82cdb4765e87e926c8c1945adedd1ed.tar.gz
android_packages_apps_UnifiedEmail-15490239c82cdb4765e87e926c8c1945adedd1ed.tar.bz2
android_packages_apps_UnifiedEmail-15490239c82cdb4765e87e926c8c1945adedd1ed.zip
Gmail changes to support Android Wear
* Replace reply/reply all action with Android Wear action. * ComposeActivity handles the reply intent and sends email in the background using AsyncTask. * Create notification bundle for all message so that user can apply action to each of the message inside the bundle. Bug 13405604 Bug 13629669 Change-Id: Ia7efa28c7f333b9571d7e99e83cba6124f843e50
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 3e60c64b8..bbc35878b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,14 @@ gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res
datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) $(datetimepicker_dir)
+##################################################
+include $(CLEAR_VARS)
+
+# STOPSHIP: Use the real support jar before ship.
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ wearable-preview-support:libs/wearable-preview-support.jar
+
+include $(BUILD_MULTI_PREBUILT)
##################################################
# Build APK
@@ -39,6 +47,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker
+LOCAL_STATIC_JAVA_LIBRARIES += wearable-preview-support
LOCAL_SDK_VERSION := current
@@ -54,7 +63,6 @@ LOCAL_EMMA_COVERAGE_FILTER := +com.android.mail.*, +com.android.emailcommon.*, +
include $(BUILD_PACKAGE)
-
##################################################
# Build all sub-directories