Include v4, use AAPT2

Test: make checkbuild
Change-Id: I663698dbc698685139250f7fc7150894cfa9b7d0

diff --git a/Android.mk b/Android.mk
index 745a2ad..28785f7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v4 \
+        android-support-v13
+
 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
@@ -19,6 +22,7 @@ LOCAL_RESOURCE_DIR += \
        $(LOCAL_PATH)/res \
        $(LOCAL_PATH)/res_p
 
+LOCAL_USE_AAPT2 := true
 
 include $(LOCAL_PATH)/version.mk
 LOCAL_AAPT_FLAGS := \