DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ia90d6fec54b193ab2e67a550821fa6798a400af2
diff --git a/Android.mk b/Android.mk
index 994be22..5ae29d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,14 +16,15 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libchips
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-annotations
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-logtags-files-under, src)
-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
+LOCAL_USE_AAPT2 := true
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_STATIC_JAVA_LIBRARY)
##################################################
diff --git a/sample/Android.mk b/sample/Android.mk
index dd35ec3..a572bff 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -14,10 +14,6 @@
LOCAL_PATH:= $(call my-dir)
-# Include res dir from chips
-chips_dir := ../res
-local_res_dirs := res $(chips_dir)
-
##################################################
# Build APK
include $(CLEAR_VARS)
@@ -25,15 +21,17 @@
src_dirs := src
LOCAL_PACKAGE_NAME := libChipsSample
-LOCAL_STATIC_JAVA_LIBRARIES += libchips
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ libchips \
+ android-support-compat \
+ android-support-annotations
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_PATH)/../../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:android.support.compat
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
include $(BUILD_PACKAGE)
