diff options
| author | Ian Lake <ilake@google.com> | 2017-07-17 10:13:22 -0700 |
|---|---|---|
| committer | Ian Lake <ilake@google.com> | 2017-07-17 10:13:22 -0700 |
| commit | a790baf13c1e2d5c4bf9035e04374b0b314e11f2 (patch) | |
| tree | f2f59fc5768ecaa53a7d0e31996563912b1dde9b | |
| parent | 295176f0bed2d3306a41183643a6c755f210de2a (diff) | |
| download | photoviewer-a790baf13c1e2d5c4bf9035e04374b0b314e11f2.tar.gz | |
Use AAPT2 for photoviewer sample
Test: make -j32 PRODUCT-sailfish-userdebug ANDROID_COMPILE_WITH_JACK=false java-dex tests
BUG: 28983951
Change-Id: Ibd4e1a74d27494f1bfc4bd8bf771e48f1ba52551
| -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) |