Merge "Move Gallery2 over to AAPT2 and new v4 modules"
diff --git a/Android.mk b/Android.mk
index d539141..973d1ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,23 +4,25 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v4 \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-fragment \
+ android-support-core-ui \
+ android-support-compat \
android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
-LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
-LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ com.android.gallery3d.common2 \
+ xmp_toolkit \
+ mp4parser
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
- $(call all-renderscript-files-under, src)
-LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+ $(call all-renderscript-files-under, src) \
+ $(call all-java-files-under, src_pd)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
- $(LOCAL_PATH)/../../../frameworks/support/compat/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := Gallery2
@@ -28,7 +30,10 @@
LOCAL_SDK_VERSION := current
-LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
+LOCAL_JNI_SHARED_LIBRARIES := \
+ libjni_eglfence \
+ libjni_filtershow_filters \
+ libjni_jpegstream
LOCAL_PROGUARD_FLAG_FILES := proguard.flags