Move Gallery2 over to AAPT2 and new v4 modules

Bug: 35994894
Test: make
Change-Id: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7

diff --git a/Android.mk b/Android.mk
index 7c4ada1..973d1ad 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,28 +4,25 @@ include $(CLEAR_VARS)
 
 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_PATH)/../../../frameworks/support/media-compat/res \
-    $(LOCAL_PATH)/../../../frameworks/support/core-ui/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += \
-    --extra-packages android.support.compat \
-    --extra-packages android.support.mediacompat \
-    --extra-packages android.support.coreui \
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Gallery2
 
@@ -33,7 +30,10 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 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