diff options
| author | Chris Craik <ccraik@android.com> | 2015-02-24 00:39:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-24 00:39:50 +0000 |
| commit | 46ca918db82c1fca3f370ec6a9b936bf7268aa85 (patch) | |
| tree | 86c96f06c1e225c8e23a5858b60c423cc89b872a /framesequence/jni/Android.mk | |
| parent | f924719d491c2b1a1c42234a0a174d975691b483 (diff) | |
| parent | 482fc563fa9783cce1dee882e8d4cd4d2d92b1c6 (diff) | |
| download | android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.tar.gz android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.tar.bz2 android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.zip | |
am 482fc563: Merge "Make WebP in FrameSequence optional"
* commit '482fc563fa9783cce1dee882e8d4cd4d2d92b1c6':
Make WebP in FrameSequence optional
Diffstat (limited to 'framesequence/jni/Android.mk')
| -rw-r--r-- | framesequence/jni/Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/framesequence/jni/Android.mk b/framesequence/jni/Android.mk index e9d0ec5..7353436 100644 --- a/framesequence/jni/Android.mk +++ b/framesequence/jni/Android.mk @@ -19,13 +19,12 @@ include $(CLEAR_VARS) ## Main library -LOCAL_STATIC_LIBRARIES += libgif libwebp-decode +LOCAL_STATIC_LIBRARIES = libgif LOCAL_LDFLAGS := -llog -ljnigraphics LOCAL_C_INCLUDES := \ - external/giflib \ - external/webp/include + external/giflib LOCAL_MODULE := libframesequence LOCAL_SRC_FILES := \ @@ -33,11 +32,16 @@ LOCAL_SRC_FILES := \ FrameSequence.cpp \ FrameSequenceJNI.cpp \ FrameSequence_gif.cpp \ - FrameSequence_webp.cpp \ JNIHelpers.cpp \ Registry.cpp \ Stream.cpp +ifeq ($(FRAMESEQUENCE_INCLUDE_WEBP),true) + LOCAL_C_INCLUDES += external/webp/include + LOCAL_SRC_FILES += FrameSequence_webp.cpp + LOCAL_STATIC_LIBRARIES += libwebp-decode +endif + LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wno-unused-variable -Wno-overloaded-virtual LOCAL_CFLAGS += -fvisibility=hidden |