From 70d01242f8898aeb9dddfbbeaf3f22421479fe7c Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 15 Sep 2016 03:42:29 -0700 Subject: [PATCH] MB: Change Android Clang to build shared instead of static. A recent build error on Android revealed that we're always doing static builds for the Android Debug builders. This changes one to be building shared library instead (is_component_build=true), which should prevent such breakages in the future. BUG=webrtc:6360 NOTRY=True Review-Url: https://codereview.webrtc.org/2342033002 Cr-Commit-Position: refs/heads/master@{#14226} --- webrtc/build/mb_config.pyl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl index bf43c379e7..82c3832a14 100644 --- a/webrtc/build/mb_config.pyl +++ b/webrtc/build/mb_config.pyl @@ -59,7 +59,7 @@ 'Android32 Builder x86': 'android_gn_release_bot_x86', 'Android32 Builder x86 (dbg)': 'android_gn_debug_static_bot_x86', 'Android32 Builder MIPS (dbg)': 'android_gn_clang_debug_static_bot_mipsel', - 'Android32 Clang (dbg)': 'android_gn_clang_debug_static_bot_arm', + 'Android32 Clang (dbg)': 'android_gn_clang_debug_bot_arm', 'Android64 Builder': 'android_gn_release_bot_arm64', 'Android64 Builder (dbg)': 'android_gn_debug_static_bot_arm64', 'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64', @@ -139,7 +139,7 @@ 'android_compile_mips_dbg': 'android_gn_clang_debug_static_bot_mipsel', 'android_dbg': 'android_gn_debug_static_bot_arm', 'android_rel': 'android_gn_release_bot_arm', - 'android_clang_dbg': 'android_gn_clang_debug_static_bot_arm', + 'android_clang_dbg': 'android_gn_clang_debug_bot_arm', 'android_arm64_rel': 'android_gn_release_bot_arm64', 'android_n6': 'android_gn_debug_static_bot_arm', 'android_gyp_dbg': 'android_gyp_debug_static_bot_arm', @@ -319,8 +319,8 @@ 'android_gn_release_bot_x86': [ 'android', 'gn', 'release_bot', 'x86' ], - 'android_gn_clang_debug_static_bot_arm': [ - 'android', 'gn', 'clang', 'debug_static_bot', 'arm' + 'android_gn_clang_debug_bot_arm': [ + 'android', 'gn', 'clang', 'debug_bot', 'arm' ], 'android_gn_clang_debug_static_bot_mipsel': [ 'android', 'gn', 'clang', 'debug_static_bot', 'mipsel'