From 6156c93cb921ab543a1450840581adeb1e2db3b3 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 20 Apr 2022 09:43:23 +0200 Subject: Fix linking when cross-compiling arm64->x86_64 For some unknown reason linker fails on 90-based due to unresolved symbols for libaom for its internal objects. Set final linkage to use object files instead of archive. Note this is not an issue with 94-based and it is not related to source code of libaom. Also universal builds are not affected as we do 'intermediate' object file before final linkage. Change-Id: Icf7110cbe5af11d6ab27bf921f512beca7afa9fd Reviewed-by: Allan Sandfeld Jensen --- chromium/third_party/libaom/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/third_party/libaom/BUILD.gn b/chromium/third_party/libaom/BUILD.gn index 9b065bd7b17..51ab02734b6 100644 --- a/chromium/third_party/libaom/BUILD.gn +++ b/chromium/third_party/libaom/BUILD.gn @@ -206,7 +206,7 @@ if (enable_libaom) { } } - static_library("libaom") { + source_set("libaom") { if (!is_debug && is_win) { configs -= [ "//build/config/compiler:default_optimization" ] configs += [ "//build/config/compiler:optimize_max" ] -- cgit v1.2.1