diff options
Diffstat (limited to 'sample')
| -rw-r--r-- | sample/Android.mk | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sample/Android.mk b/sample/Android.mk index cc0d9b8..a636898 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -14,10 +14,6 @@ LOCAL_PATH:= $(call my-dir) -#Include res dir from photoviewer -photo_dir := ../res ../activity/res -res_dirs := $(photo_dir) res - ################################################## # Build APK include $(CLEAR_VARS) @@ -25,42 +21,45 @@ include $(CLEAR_VARS) src_dirs := src LOCAL_PACKAGE_NAME := PhotoViewerSample -LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer - -LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4 +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-annotations \ + android-support-compat \ + android-support-core-ui \ + android-support-core-utils \ + android-support-fragment \ + libphotoviewer 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_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) ################################################## - -#Include res dir from photoviewer -photo_dir := ../res ../appcompat/res -res_dirs := $(photo_dir) res - # Build APK include $(CLEAR_VARS) src_dirs := src LOCAL_PACKAGE_NAME := AppcompatPhotoViewerSample -LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer_appcompat - LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-annotations \ + android-support-compat \ + android-support-core-ui \ + android-support-core-utils \ + android-support-fragment \ + android-support-media-compat \ android-support-v7-appcompat \ - android-support-v4 + libphotoviewer_appcompat 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_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) |