From 2c56354d4c0a26b742d4326f63382b826b5eb825 Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Tue, 27 Aug 2013 17:40:28 -0700 Subject: [PATCH] Use support lib gridlayout. Change-Id: I6eef37481bd8a97312a3646374d4aad4027d4e5c --- Android.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 5c05c0976..88565d2ab 100644 --- a/Android.mk +++ b/Android.mk @@ -24,7 +24,8 @@ chips_dir := ../../../frameworks/ex/chips/res unified_email_dir := ../UnifiedEmail photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res emailcommon_dir := emailcommon -res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res +gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res +res_dir := $(chips_dir) res $(unified_email_dir)/res $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) LOCAL_MODULE_TAGS := optional @@ -39,10 +40,11 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.gridlayout LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync guava android-common-chips libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 LOCAL_PACKAGE_NAME := Email