X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=34d7cb4811ebec10a7863beb629cb4c9bb8e129d;hb=ebc76c043dcca9fe5ff5dbe9310d312792a2246b;hp=973d1ad2bf5f5599da68e590caab225577c62d45;hpb=fac21a096afbe8eb517726cf4f9f093eade87ddc;p=android-x86%2Fpackages-apps-Gallery2.git diff --git a/Android.mk b/Android.mk index 973d1ad2b..34d7cb481 100644 --- a/Android.mk +++ b/Android.mk @@ -5,10 +5,10 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-fragment \ - android-support-core-ui \ - android-support-compat \ - android-support-v13 + 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 \ @@ -39,6 +39,8 @@ 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)),)