diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 4775d688b..ef3693a5c 100644 --- a/Android.mk +++ b/Android.mk @@ -17,12 +17,13 @@ LOCAL_PATH:= $(call my-dir) # Include res dir from chips chips_dir := ../../../frameworks/opt/chips/res -#Include res dir from photoviewer +#Include res dir from libraries +appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res bitmap_dir := ../../../frameworks/opt/bitmap/res datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res -res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) +res_dirs := res $(appcompat_dir) $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir) ################################################## # Build APK @@ -36,6 +37,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-appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap @@ -48,7 +50,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:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker LOCAL_PROGUARD_FLAG_FILES := proguard.flags |