diff options
Diffstat (limited to 'Android.mk')
| -rwxr-xr-x[-rw-r--r--] | Android.mk | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index f685e6bef..106299d31 100644..100755 --- a/Android.mk +++ b/Android.mk @@ -4,23 +4,14 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := telephony-common + 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_JAVA_LIBRARIES += android-support-v8-renderscript - -LOCAL_RENDERSCRIPT_TARGET_API := 18 -LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 -LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript - -# Keep track of previously compiled RS files too (from bundled GalleryGoogle). -prev_compiled_rs_files := $(call all-renderscript-files-under, src) -# We already have these files from GalleryGoogle, so don't install them. -LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files) +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) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res @@ -29,14 +20,26 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_PACKAGE_NAME := Gallery2 +LOCAL_CERTIFICATE := platform + LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_PROGUARD_ENABLED := disabled -LOCAL_SDK_VERSION := current +#LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream +ifeq ($(TARGET_TS_MAKEUP), true) + LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni +endif + +ifeq ($(WITH_SLIM_GALLERY2), true) + LOCAL_MANIFEST_FILE := slim_manifest/AndroidManifest.xml +else + LOCAL_MANIFEST_FILE := AndroidManifest.xml +endif + LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_JAVA_LIBRARIES += org.apache.http.legacy |