diff options
| author | Alan Lau <alanlau@google.com> | 2014-04-17 11:19:11 -0700 |
|---|---|---|
| committer | Alan Lau <alanlau@google.com> | 2014-04-18 18:11:57 +0000 |
| commit | 3af592c8e647c827d747891dcdd89e66f7fb3674 (patch) | |
| tree | 506a7c4c5714644a6d74f617dcf5014204821af1 /Android.mk | |
| parent | f1f80e6927b709451c85223a5513cf57b2e6b8df (diff) | |
| download | android_packages_apps_UnifiedEmail-3af592c8e647c827d747891dcdd89e66f7fb3674.tar.gz android_packages_apps_UnifiedEmail-3af592c8e647c827d747891dcdd89e66f7fb3674.tar.bz2 android_packages_apps_UnifiedEmail-3af592c8e647c827d747891dcdd89e66f7fb3674.zip | |
Add dependency to prebuilt wearable jar.
Bug 14131130
Change-Id: Ia8af84c25bc7ab9450907184022c9a577ec7effd
(cherry picked from commit b73a16671e5ff1d5a7bfd4fb0ff40053f524a0d6)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index bbc35878b..bc81af2a9 100644 --- a/Android.mk +++ b/Android.mk @@ -26,10 +26,6 @@ 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) ################################################## @@ -47,7 +43,8 @@ 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 +# STOPSHIP: Open source the wearable support jar +LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support LOCAL_SDK_VERSION := current |