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
Import translations. DO NOT MERGE am: 7367f4e5a3 -s ours am: 21391848ee -s ours
[android-x86/packages-apps-Gallery2.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
670cc4c
..
7c4ada1
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-4,7
+4,9
@@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-v4 \
+ 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
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@
-14,9
+16,16
@@
LOCAL_SRC_FILES := \
$(call all-renderscript-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
$(call all-renderscript-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+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_AAPT_FLAGS := --auto-add-overlay
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_PACKAGE_NAME := Gallery2
LOCAL_PACKAGE_NAME := Gallery2