X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=68d573a00ab2efe672d431dbc16debd023c6605c;hb=5f3bceec3533f91e5f2f90d34b33459126e3765d;hp=47e9c864cfbb4e0c23e7e701c8632b71714c12bf;hpb=62c70f5f3d172dfdd518160ed3db1655760074df;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 47e9c864c..68d573a00 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,22 +4,25 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
-LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
-LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.fragment_fragment \
+    androidx.legacy_legacy-support-core-ui \
+    androidx.core_core \
+    androidx.legacy_legacy-support-v13
+
+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
 
@@ -27,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