diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2017-04-21 10:22:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-21 10:22:24 +0000 |
| commit | b7b18246dc86a04053feb93faa4dd4a5680800d5 (patch) | |
| tree | 35c93afb6e02d7ffb62fc269d8556a6408c6a22d | |
| parent | f2caaa491dca78d6729341729781d530e4e99f83 (diff) | |
| parent | caf86780914d990808eff852e8f831265e815c2a (diff) | |
| download | photoviewer-b7b18246dc86a04053feb93faa4dd4a5680800d5.tar.gz | |
Fix build for PhotoViewerSample
am: caf8678091
Change-Id: I028886d0abb12dd20e8539154d76806c67e29a8c
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | sample/Android.mk | 4 |
2 files changed, 9 insertions, 5 deletions
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) # This is to allow the library to be loaded dynamically in a context where # the required libraries already exist. You should only use this library # if you're certain that you need it; see go/extradex-design for more context. -appcompat_res_dirs := appcompat/res res ../../../$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res +appcompat_res_dirs := appcompat/res res ../../../$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res ../../../$(SUPPORT_LIBRARY_ROOT)/compat/res include $(CLEAR_VARS) LOCAL_MODULE := libphotoviewer_appcompat_dynamic @@ -35,6 +35,7 @@ LOCAL_SRC_FILES := \ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(appcompat_res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_AAPT_FLAGS += --extra-packages android.support.compat include $(BUILD_STATIC_JAVA_LIBRARY) @@ -43,7 +44,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # go/extradex-design for more context. include $(CLEAR_VARS) -activity_res_dirs := activity/res res +activity_res_dirs := activity/res res ../../../$(SUPPORT_LIBRARY_ROOT)/compat/res LOCAL_MODULE := libphotoviewer_dynamic LOCAL_JAVA_LIBRARIES := android-support-v4 @@ -56,6 +57,7 @@ LOCAL_SRC_FILES := \ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(activity_res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_AAPT_FLAGS += --extra-packages android.support.compat include $(BUILD_STATIC_JAVA_LIBRARY) @@ -74,13 +76,14 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(appcompat_res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_AAPT_FLAGS += --extra-packages android.support.compat include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) -activity_res_dirs := activity/res res +activity_res_dirs := activity/res res ../../../$(SUPPORT_LIBRARY_ROOT)/compat/res LOCAL_MODULE := libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES := libphotoviewer_dynamic android-support-v4 @@ -90,6 +93,7 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(activity_res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay +LOCAL_AAPT_FLAGS += --extra-packages android.support.compat include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/sample/Android.mk b/sample/Android.mk index e5d1917..b7724bd 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 +res_dirs := $(photo_dir) res ../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res ################################################## # Build APK @@ -33,7 +33,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.photo +LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.photo:android.support.compat include $(BUILD_PACKAGE) |