Revert "Include v4, use AAPT2"

Unbundled build was mysteriously failing on missing v13 res APK.

This reverts commit 1c43fe84ebb78d2dc72879be405042ff27d2e2df.

Change-Id: I17d95538dcda742baaf4f356ccdea09a7db016a6

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