OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Snap for 4807121 from 742282346a265eebdc0258254050ae42baa24fb2 to pi-release
[android-x86/packages-apps-Gallery2.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
973d1ad
..
34d7cb4
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-5,10
+5,10
@@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android
-support-
fragment \
- android-support-core-ui \
- android
-support-compat
\
- android-support-v13
+ android
x.fragment_
fragment \
+ android
x.legacy_legacy
-support-core-ui \
+ android
x.core_core
\
+ android
x.legacy_legacy
-support-v13
LOCAL_STATIC_JAVA_LIBRARIES := \
com.android.gallery3d.common2 \
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_JAVA_LIBRARIES += org.apache.http.legacy
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+
include $(BUILD_PACKAGE)
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
include $(BUILD_PACKAGE)
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)