X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=34d7cb4811ebec10a7863beb629cb4c9bb8e129d;hb=refs%2Ftags%2Fandroid-x86-9.0-r2;hp=670cc4cc919f80c5e7aa9dceb45450d5c3be0a21;hpb=ede3bd22c4814b962923dcc0d647fea92a0a886d;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 670cc4cc9..34d7cb481 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,19 +4,25 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-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_AAPT_FLAGS := --auto-add-overlay
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Gallery2
 
@@ -24,12 +30,17 @@ 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
 
 LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
 
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+
 include $(BUILD_PACKAGE)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)