1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 9906e8dc..fc15f32d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13-prebuilt
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 LOCAL_SDK_VERSION := current
@@ -32,8 +35,7 @@ LOCAL_OVERRIDES_PACKAGES := Home
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_USE_AAPT2 := true
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 include $(BUILD_PACKAGE)