diff options
Diffstat (limited to 'files/Android.mk')
| -rw-r--r-- | files/Android.mk | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/files/Android.mk b/files/Android.mk index cc17bde2..36c02adf 100644 --- a/files/Android.mk +++ b/files/Android.mk @@ -15,12 +15,9 @@ LOCAL_SRC_FILES := \ source/convert_argb.cc \ source/convert_from.cc \ source/convert_from_argb.cc \ - source/convert_jpeg.cc \ source/convert_to_argb.cc \ source/convert_to_i420.cc \ source/cpu_id.cc \ - source/mjpeg_decoder.cc \ - source/mjpeg_validate.cc \ source/planar_functions.cc \ source/rotate.cc \ source/rotate_any.cc \ @@ -49,9 +46,17 @@ LOCAL_SRC_FILES := \ source/scale_neon64.cc \ source/video_common.cc -common_CFLAGS := -Wall -fexceptions -DHAVE_JPEG -LOCAL_CFLAGS += $(common_CFLAGS) +common_CFLAGS := -Wall -fexceptions +ifneq ($(LIBYUV_DISABLE_JPEG), "yes") +LOCAL_SRC_FILES += \ + source/convert_jpeg.cc \ + source/mjpeg_decoder.cc \ + source/mjpeg_validate.cc +common_CFLAGS += -DHAVE_JPEG LOCAL_SHARED_LIBRARIES := libjpeg +endif + +LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -65,6 +70,32 @@ include $(CLEAR_VARS) LOCAL_WHOLE_STATIC_LIBRARIES := libyuv_static LOCAL_MODULE := libyuv +ifneq ($(LIBYUV_DISABLE_JPEG), "yes") LOCAL_SHARED_LIBRARIES := libjpeg +endif include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_STATIC_LIBRARIES := libyuv_static +LOCAL_SHARED_LIBRARIES := libjpeg +LOCAL_MODULE_TAGS := tests +LOCAL_CPP_EXTENSION := .cc +LOCAL_C_INCLUDES += $(LOCAL_PATH)/include +LOCAL_SRC_FILES := \ + unit_test/unit_test.cc \ + unit_test/basictypes_test.cc \ + unit_test/color_test.cc \ + unit_test/compare_test.cc \ + unit_test/convert_test.cc \ + unit_test/cpu_test.cc \ + unit_test/math_test.cc \ + unit_test/planar_test.cc \ + unit_test/rotate_argb_test.cc \ + unit_test/rotate_test.cc \ + unit_test/scale_argb_test.cc \ + unit_test/scale_test.cc \ + unit_test/video_common_test.cc + +LOCAL_MODULE := libyuv_unittest +include $(BUILD_NATIVE_TEST) |