Add MJPEG support
This adds MJPEG support in libyuv_static, but it also adds dependency of
libjpeg for modules linked with libyuv_static.
BUG: 26318505
Change-Id: I98c70bda5767dc5261268b72986b3a597c28d1be
diff --git a/Android.mk b/Android.mk
index 6fc2ec2..212c4fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,7 @@
files/source/convert_from.cc \
files/source/cpu_id.cc \
files/source/format_conversion.cc \
+ files/source/mjpeg_decoder.cc \
files/source/planar_functions.cc \
files/source/rotate.cc \
files/source/rotate_argb.cc \
@@ -19,7 +20,7 @@
files/source/scale_argb.cc \
files/source/video_common.cc
-common_CFLAGS := -Wall -fexceptions
+common_CFLAGS := -Wall -fexceptions -DHAVE_JPEG
common_C_INCLUDES = $(LOCAL_PATH)/files/include
@@ -37,6 +38,7 @@
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libjpeg
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/files/include
