diff options
| author | James Zern <jzern@google.com> | 2015-02-24 18:25:06 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-03-03 17:53:48 -0800 |
| commit | a98757650a26fff1305e6e97d58402826941170c (patch) | |
| tree | 86e480b040a365ece84d81e7d381d5c17c65c978 | |
| parent | a6d485972589c8b362de87e7a54aee9077908bb3 (diff) | |
| download | libwebp-a98757650a26fff1305e6e97d58402826941170c.tar.gz | |
Android.mk: add webpdecoder{,_static} targets
webpdecoder_static is reused to create libwebpdecoder.so and
libwebp.{a,so}
(cherry picked from commit 8697a3bcc80bad6ad8e2656a4698b466ba190216)
Change-Id: I940293cb755040c0ea45dc13f22624de8f355867
| -rw-r--r-- | Android.mk | 39 |
1 files changed, 35 insertions, 4 deletions
@@ -97,15 +97,14 @@ utils_enc_srcs := \ src/utils/quant_levels.c \ ################################################################################ -# libwebp +# libwebpdecoder include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(dec_srcs) \ - $(dsp_dec_srcs) $(dsp_enc_srcs) \ - $(enc_srcs) \ - $(utils_dec_srcs) $(utils_enc_srcs) \ + $(dsp_dec_srcs) \ + $(utils_dec_srcs) \ LOCAL_CFLAGS := $(WEBP_CFLAGS) LOCAL_C_INCLUDES += $(LOCAL_PATH)/src @@ -115,6 +114,38 @@ LOCAL_ARM_MODE := arm LOCAL_STATIC_LIBRARIES := cpufeatures +LOCAL_MODULE := webpdecoder_static + +include $(BUILD_STATIC_LIBRARY) + +ifeq ($(ENABLE_SHARED),1) +include $(CLEAR_VARS) + +LOCAL_WHOLE_STATIC_LIBRARIES := webpdecoder_static + +LOCAL_MODULE := webpdecoder + +include $(BUILD_SHARED_LIBRARY) +endif # ENABLE_SHARED=1 + +################################################################################ +# libwebp + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(dsp_enc_srcs) \ + $(enc_srcs) \ + $(utils_enc_srcs) \ + +LOCAL_CFLAGS := $(WEBP_CFLAGS) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/src + +# prefer arm over thumb mode for performance gains +LOCAL_ARM_MODE := arm + +LOCAL_WHOLE_STATIC_LIBRARIES := webpdecoder_static + LOCAL_MODULE := webp ifeq ($(ENABLE_SHARED),1) |