diff options
| author | Chris Craik <ccraik@android.com> | 2015-02-24 00:33:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 00:33:51 +0000 |
| commit | 482fc563fa9783cce1dee882e8d4cd4d2d92b1c6 (patch) | |
| tree | 9e41a8b11b3c3d3cd449ef4eb46f51f422a6e58d /framesequence/jni/Android.mk | |
| parent | 6765631b2eac9978b7ca2b7f8ef0dd6b53808d10 (diff) | |
| parent | 1dcd11c8d1b433446147c8f1bddfa277c26c918e (diff) | |
| download | android_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.tar.gz android_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.tar.bz2 android_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.zip | |
Merge "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 |