Build with AAPT2
Change-Id: Ib0b4a597efae178785c308451b882196c2fb807a
diff --git a/Android.mk b/Android.mk
index 6c8260a..d29de83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,37 +11,34 @@
# Build the Settings APK
include $(CLEAR_VARS)
-LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_PACKAGE_NAME := Settings
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_USE_AAPT2 := true
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v13 \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \
- android-support-v14-preference \
+ android-support-v14-preference
+
+LOCAL_JAVA_LIBRARIES := \
+ bouncycastle \
+ core-oj \
+ telephony-common \
+ ims-common
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
jsr305 \
settings-logtags
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
- frameworks/support/v7/preference/res \
- frameworks/support/v14/preference/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res
-
-LOCAL_PACKAGE_NAME := Settings
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview
-
ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_JACK_ENABLED := incremental