Fix build for PhotoViewerSample am: caf8678091
am: b7b18246dc
Change-Id: I52b8d680c7c3e834b3dd3aecb56847a3a14837d6
diff --git a/Android.mk b/Android.mk
index 062d499..311f8c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
# 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_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 @@
# 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_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_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_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 @@
#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 @@
$(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)
