From e8a72fdb72646ba12a1e1b39eedc674dcf968d48 Mon Sep 17 00:00:00 2001 From: Alexey Gladkov Date: Mon, 27 Aug 2018 14:53:58 +0300 Subject: [PATCH] ALT: openh264 always pic on x86 --- third_party/openh264/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn index a8c658b5c91..9316ffd6d93 100644 --- a/third_party/openh264/BUILD.gn +++ b/third_party/openh264/BUILD.gn @@ -36,21 +36,21 @@ config("config") { if (is_android) { # Android NDK is necessary for its cpufeatures and this define is what # OpenH264 code uses to check if it should be used. defines += [ "ANDROID_NDK" ] } } # MSAN builds are flaky with assembler. crbug.com/685168 use_assembler = (is_win || is_mac || is_linux || is_chromeos) && - (current_cpu == "x86" || current_cpu == "x64") && !is_msan + (current_cpu == "x64") && !is_msan # This IF statement will make the targets visible only on specific builds, # which will lead to failures on other platforms if accidentally invoked. if (use_assembler) { asm_defines = [] if (!is_component_build) { if (is_apple) { asm_defines += [ "WELS_PRIVATE_EXTERN=private_extern" ] } else if (is_linux || is_chromeos || is_android || is_fuchsia) { asm_defines += [ "WELS_PRIVATE_EXTERN=hidden" ] -- 2.25.4