From 75122e44d21a0587b9ba3968f3ee399524ad5866 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 20 Apr 2017 19:08:52 -0700 Subject: Convert external/libyuv to Android.bp See build/soong/README.md for more information. Bug: 37646797 Test: m -j checkbuild Change-Id: I9eeafa6fe101acf59c5eb43376e5a8280158457a --- Android.bp | 1 + Android.mk | 5 --- files/Android.bp | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ files/Android.mk | 101 ------------------------------------------------------- 4 files changed, 90 insertions(+), 106 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk create mode 100644 files/Android.bp delete mode 100644 files/Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..515d5626 --- /dev/null +++ b/Android.bp @@ -0,0 +1 @@ +subdirs = ["files"] diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 42e9e427..00000000 --- a/Android.mk +++ /dev/null @@ -1,5 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# libyuv -include external/libyuv/files/Android.mk diff --git a/files/Android.bp b/files/Android.bp new file mode 100644 index 00000000..359d64c8 --- /dev/null +++ b/files/Android.bp @@ -0,0 +1,89 @@ +cc_library { + name: "libyuv", + + srcs: [ + "source/compare.cc", + "source/compare_common.cc", + "source/compare_gcc.cc", + "source/compare_neon.cc", + "source/compare_neon64.cc", + "source/convert.cc", + "source/convert_argb.cc", + "source/convert_from.cc", + "source/convert_from_argb.cc", + "source/convert_to_argb.cc", + "source/convert_to_i420.cc", + "source/cpu_id.cc", + "source/planar_functions.cc", + "source/rotate.cc", + "source/rotate_any.cc", + "source/rotate_argb.cc", + "source/rotate_common.cc", + "source/rotate_dspr2.cc", + "source/rotate_gcc.cc", + "source/rotate_msa.cc", + "source/rotate_neon.cc", + "source/rotate_neon64.cc", + "source/row_any.cc", + "source/row_common.cc", + "source/row_dspr2.cc", + "source/row_gcc.cc", + "source/row_msa.cc", + "source/row_neon.cc", + "source/row_neon64.cc", + "source/scale.cc", + "source/scale_any.cc", + "source/scale_argb.cc", + "source/scale_common.cc", + "source/scale_dspr2.cc", + "source/scale_gcc.cc", + "source/scale_msa.cc", + "source/scale_neon.cc", + "source/scale_neon64.cc", + "source/video_common.cc", + + "source/convert_jpeg.cc", + "source/mjpeg_decoder.cc", + "source/mjpeg_validate.cc", + ], + + cflags: [ + "-Wall", + "-Wno-unused-parameter", + "-fexceptions", + "-DHAVE_JPEG", + ], + + shared_libs: ["libjpeg"], + + export_include_dirs: ["include"], +} + +// compatibilty static library until all uses of libyuv_static are replaced +// with libyuv (b/37646797) +cc_library_static { + name: "libyuv_static", + whole_static_libs: ["libyuv"], +} + +cc_test { + name: "libyuv_unittest", + static_libs: ["libyuv"], + shared_libs: ["libjpeg"], + + srcs: [ + "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", + ], +} diff --git a/files/Android.mk b/files/Android.mk deleted file mode 100644 index 36c02adf..00000000 --- a/files/Android.mk +++ /dev/null @@ -1,101 +0,0 @@ -# This is the Android makefile for libyuv for NDK. -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_CPP_EXTENSION := .cc - -LOCAL_SRC_FILES := \ - source/compare.cc \ - source/compare_common.cc \ - source/compare_gcc.cc \ - source/compare_neon.cc \ - source/compare_neon64.cc \ - source/convert.cc \ - source/convert_argb.cc \ - source/convert_from.cc \ - source/convert_from_argb.cc \ - source/convert_to_argb.cc \ - source/convert_to_i420.cc \ - source/cpu_id.cc \ - source/planar_functions.cc \ - source/rotate.cc \ - source/rotate_any.cc \ - source/rotate_argb.cc \ - source/rotate_common.cc \ - source/rotate_dspr2.cc \ - source/rotate_gcc.cc \ - source/rotate_msa.cc \ - source/rotate_neon.cc \ - source/rotate_neon64.cc \ - source/row_any.cc \ - source/row_common.cc \ - source/row_dspr2.cc \ - source/row_gcc.cc \ - source/row_msa.cc \ - source/row_neon.cc \ - source/row_neon64.cc \ - source/scale.cc \ - source/scale_any.cc \ - source/scale_argb.cc \ - source/scale_common.cc \ - source/scale_dspr2.cc \ - source/scale_gcc.cc \ - source/scale_msa.cc \ - source/scale_neon.cc \ - source/scale_neon64.cc \ - source/video_common.cc - -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 - -LOCAL_MODULE := libyuv_static -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_LIBRARY) - -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) -- cgit v1.2.3