From 0e419c1b22c4f8827205ffcd8e53e3bd8edd8d34 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Tue, 8 Jun 2021 16:33:20 +0300 Subject: [PATCH] Android.mk: Rename libyuv->libyuv_chromium, remove unused targets Original source: https://chromium.googlesource.com/libyuv/libyuv/+/refs/heads/main AOSP has some old and modified version of libyuv library, which can't be used with mainline libcamera. To use libcamera in AOSP both AOSP libyuv and Chromium libyuv needs to coexist in a single build. Signed-off-by: Roman Stratiienko --- Android.bp | 90 ++----------------------------------------- Android.mk | 110 ----------------------------------------------------- 2 files changed, 3 insertions(+), 197 deletions(-) delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp index ce1f62e01b8f7..281212fdacd8b 100644 --- a/Android.bp +++ b/Android.bp @@ -1,9 +1,6 @@ cc_library { - name: "libyuv", + name: "libyuv_chromium", vendor_available: true, - vndk: { - enabled: true, - }, srcs: [ "source/compare.cc", @@ -69,88 +66,7 @@ cc_library { // compatibilty static library until all uses of libyuv_static are replaced // with libyuv (b/37646797) cc_library_static { - name: "libyuv_static", + name: "libyuv_chromium_static", vendor_available: true, - whole_static_libs: ["libyuv"], -} - -cc_test { - name: "libyuv_unittest", - static_libs: ["libyuv"], - shared_libs: ["libjpeg"], - cflags: ["-Wall", "-Werror"], - srcs: [ - "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/cpu_thread_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/scale_uv_test.cc", - "unit_test/unit_test.cc", - "unit_test/video_common_test.cc", - ], -} - -cc_test { - name: "compare", - gtest: false, - srcs: [ - "util/compare.cc", - ], - static_libs: ["libyuv"], -} - -cc_test { - name: "i444tonv12_eg", - gtest: false, - srcs: [ - "util/i444tonv12_eg.cc", - ], - static_libs: ["libyuv"], -} - -cc_test { - name: "cpuid", - gtest: false, - srcs: [ - "util/cpuid.c", - ], - static_libs: ["libyuv"], -} - -cc_test { - name: "psnr", - gtest: false, - srcs: [ - "util/psnr_main.cc", - "util/psnr.cc", - "util/ssim.cc", - ], - static_libs: ["libyuv"], -} - -cc_test { - name: "yuvconvert", - gtest: false, - srcs: [ - "util/yuvconvert.cc", - ], - static_libs: ["libyuv"], - shared_libs: ["libjpeg"], -} - -cc_test { - name: "yuvconstants", - gtest: false, - srcs: [ - "util/yuvconstants.c", - ], - static_libs: ["libyuv"], + whole_static_libs: ["libyuv_chromium"], } diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 2ceb49281be0c..0000000000000 --- a/Android.mk +++ /dev/null @@ -1,110 +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_mmi.cc \ - source/compare_msa.cc \ - source/compare_neon.cc \ - source/compare_neon64.cc \ - source/compare_win.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_gcc.cc \ - source/rotate_mmi.cc \ - source/rotate_msa.cc \ - source/rotate_neon.cc \ - source/rotate_neon64.cc \ - source/rotate_win.cc \ - source/row_any.cc \ - source/row_common.cc \ - source/row_gcc.cc \ - source/row_mmi.cc \ - source/row_msa.cc \ - source/row_neon.cc \ - source/row_neon64.cc \ - source/row_win.cc \ - source/scale.cc \ - source/scale_any.cc \ - source/scale_argb.cc \ - source/scale_common.cc \ - source/scale_gcc.cc \ - source/scale_mmi.cc \ - source/scale_msa.cc \ - source/scale_neon.cc \ - source/scale_neon64.cc \ - source/scale_uv.cc \ - source/scale_win.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/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/cpu_thread_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/scale_uv_test.cc \ - unit_test/unit_test.cc \ - unit_test/video_common_test.cc - -LOCAL_MODULE := libyuv_unittest -include $(BUILD_NATIVE_TEST)