Enable libaom by default. Except ChromeOS and Android. Change-Id: I54acfaa74f5df5799c1709a2004d34fb9a27e60d Bug: 1095763 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617229 Commit-Queue: Jerome Jiang <jianj@google.com> Reviewed-by: James Zern <jzern@google.com> Cr-Commit-Position: refs/heads/master@{#845508}
diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn index 0f80365..9b065bd 100644 --- a/third_party/libaom/BUILD.gn +++ b/third_party/libaom/BUILD.gn
@@ -90,8 +90,9 @@ # via global function pointer symbols, which hides the object dependency at # link time. On Mac, this results in undefined references to the intrinsic # symbols. - source_set("libaom_intrinsics_sse2") { + # TODO(jianj): Align this with libvpx as this is not used there. + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -105,6 +106,7 @@ } source_set("libaom_intrinsics_sse3") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -115,6 +117,7 @@ } source_set("libaom_intrinsics_ssse3") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -127,6 +130,7 @@ } source_set("libaom_intrinsics_sse4_1") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -140,6 +144,7 @@ } source_set("libaom_intrinsics_sse4_2") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -150,6 +155,7 @@ } source_set("libaom_intrinsics_avx") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -162,6 +168,7 @@ } source_set("libaom_intrinsics_avx2") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] @@ -180,6 +187,7 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { source_set("libaom_intrinsics_neon") { + check_includes = false configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] if (current_cpu == "arm") { @@ -206,6 +214,7 @@ configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":libaom_config" ] + sources = aom_av1_common_sources sources += aom_av1_decoder_sources sources += aom_dsp_common_sources
diff --git a/third_party/libaom/options.gni b/third_party/libaom/options.gni index a184f1eb..1d7cfd83 100644 --- a/third_party/libaom/options.gni +++ b/third_party/libaom/options.gni
@@ -1,8 +1,10 @@ +import("//build/config/chromeos/ui_mode.gni") import("//build/config/gclient_args.gni") declare_args() { # Enable encoding and decoding AV1 video files. - enable_libaom = false + enable_libaom = !is_chromeos_ash && !is_android + # To be deprecated soon. enable_libaom_decoder = false }