Build with AAPT2
Change-Id: Id48c7095055860898a2ab75fea3ea83b723b3b92
diff --git a/library/Android.mk b/library/Android.mk
index 543b840..376948b 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -5,7 +5,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_USE_AAPT2 := true
LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
LOCAL_MODULE := setup-wizard-lib
LOCAL_RESOURCE_DIR := \
@@ -23,17 +23,15 @@
include $(CLEAR_VARS)
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages android.support.v7.appcompat
+LOCAL_USE_AAPT2 := true
LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
LOCAL_MODULE := setup-wizard-lib-eclair-mr1-compat
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/main/res \
- $(LOCAL_PATH)/eclair-mr1/res \
- frameworks/support/v7/appcompat/res
+ $(LOCAL_PATH)/eclair-mr1/res
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src)
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_SHARED_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v7-appcompat
@@ -46,20 +44,16 @@
#
include $(CLEAR_VARS)
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages android.support.v7.appcompat \
- --extra-packages android.support.v7.recyclerview
+LOCAL_USE_AAPT2 := true
LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
LOCAL_MODULE := setup-wizard-lib-full-support
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/main/res \
$(LOCAL_PATH)/eclair-mr1/res \
- $(LOCAL_PATH)/full-support/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res
+ $(LOCAL_PATH)/full-support/res
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src full-support/src)
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_SHARED_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v7-appcompat \
android-support-v7-recyclerview
diff --git a/library/common-eclair-mr1.mk b/library/common-eclair-mr1.mk
index e641d16..6d4761d 100644
--- a/library/common-eclair-mr1.mk
+++ b/library/common-eclair-mr1.mk
@@ -12,6 +12,8 @@
# include frameworks/opt/setupwizard/library/common-eclair-mr1.mk
#
+ifneq ($(LOCAL_USE_AAPT2),true)
+
# Check that LOCAL_RESOURCE_DIR is defined
ifeq (,$(LOCAL_RESOURCE_DIR))
$(error LOCAL_RESOURCE_DIR must be defined)
@@ -39,3 +41,15 @@
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
endif
+
+else # LOCAL_USE_AAPT2 := true
+
+ifeq (,$(findstring setup-wizard-lib-eclair-mr1-compat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+ LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-eclair-mr1-compat
+endif
+
+ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+ LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
+endif
+
+endif # LOCAL_USE_AAPT2
diff --git a/library/common-full-support.mk b/library/common-full-support.mk
index 43a6433..888d8ec 100644
--- a/library/common-full-support.mk
+++ b/library/common-full-support.mk
@@ -12,6 +12,8 @@
# include frameworks/opt/setupwizard/library/common-full-support.mk
#
+ifneq ($(LOCAL_USE_AAPT2),true)
+
# Check that LOCAL_RESOURCE_DIR is defined
ifeq (,$(LOCAL_RESOURCE_DIR))
$(error LOCAL_RESOURCE_DIR must be defined)
@@ -47,3 +49,20 @@
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
endif
+
+else # LOCAL_USE_AAPT2 := true
+
+ifeq (,$(findstring setup-wizard-lib-full-support,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+ LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib-full-support
+endif
+
+ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+ LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
+endif
+
+ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+ LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
+endif
+
+endif # LOCAL_USE_AAPT2
+
diff --git a/library/common.mk b/library/common.mk
index 05e4da1..3488b30 100644
--- a/library/common.mk
+++ b/library/common.mk
@@ -12,8 +12,12 @@
# include frameworks/opt/setupwizard/library/common.mk
#
-LOCAL_RESOURCE_DIR += \
- $(call my-dir)/main/res \
- $(call my-dir)/platform/res
-LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
-LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib
+ifneq ($(LOCAL_USE_AAPT2),true)
+ LOCAL_RESOURCE_DIR += \
+ $(call my-dir)/main/res \
+ $(call my-dir)/platform/res
+ LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
+ LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib
+else # LOCAL_USE_AAPT2 := true
+ LOCAL_STATIC_ANDROID_LIBRARIES += setup-wizard-lib
+endif # LOCAL_USE_AAPT2
