summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClara Bayarri <clarabayarri@google.com>2017-04-19 20:22:57 +0100
committerClara Bayarri <clarabayarri@google.com>2017-04-19 20:22:57 +0100
commit3391fe1bda462a35448ac801ae311e9718e2e5a7 (patch)
treee323036d038ae166b3ee0e66eb0bae354bb4f878
parentb967e80a2c830ec8fad0887945ff578267a85015 (diff)
downloadchips-3391fe1bda462a35448ac801ae311e9718e2e5a7.tar.gz
Fix build for libChipsSample
Test: none Change-Id: If2b072e189955e5a4fa2582cee959dbd645fdcc6
-rw-r--r--Android.mk4
-rw-r--r--sample/Android.mk4
2 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 5c3df78..994be22 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,9 @@ LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-logtags-files-under, src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
include $(BUILD_STATIC_JAVA_LIBRARY)
##################################################
diff --git a/sample/Android.mk b/sample/Android.mk
index f6024a6..dd35ec3 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -31,9 +31,9 @@ LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-logtags-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(local_res_dirs))
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(local_res_dirs)) $(LOCAL_PATH)/../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:android.support.compat
include $(BUILD_PACKAGE)