diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2013-08-27 11:30:34 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2013-08-27 17:36:45 -0700 |
| commit | b06a3a51d30b4cd89c66877995a70fa2b7d59cc2 (patch) | |
| tree | 8ab20a8cc52c21b302f0edd18c7e56df92587b23 /Android.mk | |
| parent | 9b5fb8460331d454750819fb927c17da5fa85503 (diff) | |
| download | android_packages_apps_UnifiedEmail-b06a3a51d30b4cd89c66877995a70fa2b7d59cc2.tar.gz android_packages_apps_UnifiedEmail-b06a3a51d30b4cd89c66877995a70fa2b7d59cc2.tar.bz2 android_packages_apps_UnifiedEmail-b06a3a51d30b4cd89c66877995a70fa2b7d59cc2.zip | |
Use support lib gridlayout.
Change-Id: I019cb12bfd88ea08d1efe8e300887f6ca8731005
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 4c1d85c74..719f1425c 100644 --- a/Android.mk +++ b/Android.mk @@ -19,7 +19,8 @@ chips_dir := ../../../frameworks/ex/chips/res #Include res dir from photoviewer photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res -res_dirs := res $(chips_dir) $(photo_dir) +gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res +res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) ################################################## @@ -34,6 +35,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += guava LOCAL_STATIC_JAVA_LIBRARIES += android-common LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 LOCAL_SDK_VERSION := current @@ -42,7 +44,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) \ $(call all-logtags-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.gridlayout LOCAL_PROGUARD_FLAG_FILES := proguard.flags |