diff options
| -rw-r--r-- | sample/Android.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sample/Android.mk b/sample/Android.mk index b7724bd..cc0d9b8 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH:= $(call my-dir) #Include res dir from photoviewer photo_dir := ../res ../activity/res -res_dirs := $(photo_dir) res ../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res +res_dirs := $(photo_dir) res ################################################## # Build APK @@ -27,13 +27,14 @@ LOCAL_PACKAGE_NAME := PhotoViewerSample LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer +LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4 + LOCAL_SDK_VERSION := current 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.photo:android.support.compat +LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) @@ -41,7 +42,7 @@ include $(BUILD_PACKAGE) #Include res dir from photoviewer photo_dir := ../res ../appcompat/res -res_dirs := $(photo_dir) res ../../../../$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res ../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res +res_dirs := $(photo_dir) res # Build APK include $(CLEAR_VARS) @@ -51,13 +52,16 @@ LOCAL_PACKAGE_NAME := AppcompatPhotoViewerSample LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer_appcompat +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v7-appcompat \ + android-support-v4 + LOCAL_SDK_VERSION := current 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 android.support.v7.appcompat:com.android.ex.photo:android.support.compat +LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) |