From 165f39cd1292c1ff210f6916e4483dd75fa03c13 Mon Sep 17 00:00:00 2001 From: Hidehiko Abe Date: Wed, 9 Sep 2020 18:39:27 +0900 Subject: [PATCH] libyuv: Expand is_linux to is_linux || is_chromeos. Currently is_linux is true on building Chrome OS, but it is planned to set to false. This is the preparation. Bug: chromium:1110266 Test: Build locally. Change-Id: Icf3445a8a828e1e1a637360363845bcca5863aca Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2400818 Reviewed-by: Frank Barchard --- BUILD.gn | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index b5a76635b..8cd334b40 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -32,9 +32,7 @@ config("libyuv_config") { # This target is built when no specific target is specified on the command line. group("default") { testonly = true - deps = [ - ":libyuv", - ] + deps = [ ":libyuv" ] if (libyuv_include_tests) { deps += [ ":compare", @@ -53,13 +51,9 @@ group("libyuv") { if (is_win && target_cpu == "x64") { # Compile with clang in order to get inline assembly - public_deps = [ - ":libyuv_internal(//build/toolchain/win:win_clang_x64)", - ] + public_deps = [ ":libyuv_internal(//build/toolchain/win:win_clang_x64)" ] } else { - public_deps = [ - ":libyuv_internal", - ] + public_deps = [ ":libyuv_internal" ] } if (libyuv_use_neon) { @@ -196,9 +190,7 @@ if (libyuv_use_neon) { "source/scale_neon64.cc", ] - deps = [ - ":libyuv_internal", - ] + deps = [ ":libyuv_internal" ] public_configs = [ ":libyuv_config" ] @@ -229,9 +221,7 @@ if (libyuv_use_msa) { "source/scale_msa.cc", ] - deps = [ - ":libyuv_internal", - ] + deps = [ ":libyuv_internal" ] public_configs = [ ":libyuv_config" ] } @@ -247,9 +237,7 @@ if (libyuv_use_mmi) { "source/scale_mmi.cc", ] - deps = [ - ":libyuv_internal", - ] + deps = [ ":libyuv_internal" ] public_configs = [ ":libyuv_config" ] } @@ -309,12 +297,10 @@ if (libyuv_include_tests) { configs += [ ":libyuv_unittest_warnings_config" ] - public_deps = [ - "//testing/gtest", - ] + public_deps = [ "//testing/gtest" ] public_configs = [ ":libyuv_unittest_config" ] - if (is_linux) { + if (is_linux || is_chromeos) { cflags = [ "-fexceptions" ] } if (is_ios) { @@ -351,10 +337,8 @@ if (libyuv_include_tests) { # sources "util/compare.cc", ] - deps = [ - ":libyuv", - ] - if (is_linux) { + deps = [ ":libyuv" ] + if (is_linux || is_chromeos) { cflags = [ "-fexceptions" ] } } @@ -364,10 +348,8 @@ if (libyuv_include_tests) { # sources "util/yuvconvert.cc", ] - deps = [ - ":libyuv", - ] - if (is_linux) { + deps = [ ":libyuv" ] + if (is_linux || is_chromeos) { cflags = [ "-fexceptions" ] } } @@ -379,9 +361,7 @@ if (libyuv_include_tests) { "util/psnr_main.cc", "util/ssim.cc", ] - deps = [ - ":libyuv", - ] + deps = [ ":libyuv" ] if (!is_ios && !libyuv_disable_jpeg) { defines = [ "HAVE_JPEG" ] @@ -403,8 +383,6 @@ if (libyuv_include_tests) { # sources "util/cpuid.c", ] - deps = [ - ":libyuv", - ] + deps = [ ":libyuv" ] } }