diff options
| author | Justin Chuang <jchuang@google.com> | 2016-01-08 03:20:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-08 03:20:34 +0000 |
| commit | 6118f52739ac45de997706bc602b6d766b2bd0dc (patch) | |
| tree | fb5e272d6883b88cc2cc8e4963ae7c4c81471992 | |
| parent | ae0f593edfe9490722fd4de5e29f341f50f361b6 (diff) | |
| parent | 7ef5d22b0a8a5ce5a91dc540511b8ffa51b063ed (diff) | |
| download | libyuv-6118f52739ac45de997706bc602b6d766b2bd0dc.tar.gz | |
Merge "Revert "Add MJPEG support""
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -10,7 +10,6 @@ common_SRC_FILES := \ 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 \ @@ -20,7 +19,7 @@ common_SRC_FILES := \ files/source/scale_argb.cc \ files/source/video_common.cc -common_CFLAGS := -Wall -fexceptions -DHAVE_JPEG +common_CFLAGS := -Wall -fexceptions ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon) common_CFLAGS += -DLIBYUV_NEON @@ -47,7 +46,6 @@ LOCAL_NDK_STL_VARIANT := stlport_static 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 LOCAL_MODULE := libyuv_static |