admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MB: Make all Android debug builds static

Browse Source 
In https://codereview.webrtc.org/2228923002 all Android debug
bots were configured to build with component=shared_library.
This is not the behavior we had before:
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium/config.py?rcl=0&l=713
This CL changes them back to static library.

BUG=589510
NOTRY=True
TBR=ehmaldonado@webrtc.org

Review-Url: https://codereview.webrtc.org/2236573002
Cr-Commit-Position: refs/heads/master@{#13718}
This commit is contained in:
kjellander 2016-08-10 09:49:37 -07:00 committed by Commit bot
parent c99d5a6132
commit 68815bf977
1 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
webrtc/build/mb_config.pyl
View File

@ -47,16 +47,16 @@
# Android
'Android32 Builder': 'android_gyp_release_bot_arm',
'Android32 Builder (dbg)': 'android_gyp_debug_bot_arm',
'Android32 Builder (dbg)': 'android_gyp_debug_static_bot_arm',
'Android32 Builder x86': 'android_gyp_release_bot_x86',
'Android32 Builder x86 (dbg)': 'android_gyp_debug_bot_x86',
'Android32 Builder MIPS (dbg)': 'android_gyp_clang_debug_bot_mipsel',
'Android32 Clang (dbg)': 'android_gyp_clang_debug_bot_arm',
'Android32 Builder x86 (dbg)': 'android_gyp_debug_static_bot_x86',
'Android32 Builder MIPS (dbg)': 'android_gyp_clang_debug_static_bot_mipsel',
'Android32 Clang (dbg)': 'android_gyp_clang_debug_static_bot_arm',
'Android64 Builder': 'android_gyp_release_bot_arm64',
'Android64 Builder (dbg)': 'android_gyp_debug_bot_arm64',
'Android64 Builder x64 (dbg)': 'android_gyp_debug_bot_x64',
'Android64 Builder (dbg)': 'android_gyp_debug_static_bot_arm64',
'Android64 Builder x64 (dbg)': 'android_gyp_debug_static_bot_x64',
'Android32 GN': 'android_gn_release_bot_arm',
'Android32 GN (dbg)': 'android_gn_debug_bot_arm',
'Android32 GN (dbg)': 'android_gn_debug_static_bot_arm',
'Android32 Tests (L Nexus5)(dbg)': 'none',
'Android32 Tests (L Nexus5)': 'none',
'Android32 Tests (L Nexus7.2)(dbg)': 'none',
@ -92,20 +92,20 @@
'linux_swarming': 'swarming_gyp_debug_bot_x64',
# Android
'android_compile_dbg': 'android_gyp_debug_bot_arm',
'android_compile_dbg': 'android_gyp_debug_static_bot_arm',
'android_compile_rel': 'android_gyp_release_bot_arm',
'android_compile_arm64_dbg': 'android_gyp_debug_bot_arm64',
'android_compile_arm64_dbg': 'android_gyp_debug_static_bot_arm64',
'android_compile_arm64_rel': 'android_gyp_release_bot_arm64',
'android_compile_x86_dbg': 'android_gyp_debug_bot_x86',
'android_compile_x86_dbg': 'android_gyp_debug_static_bot_x86',
'android_compile_x86_rel': 'android_gyp_release_bot_x86',
'android_compile_x64_dbg': 'android_gyp_debug_bot_x64',
'android_compile_mips_dbg': 'android_gyp_clang_debug_bot_mipsel',
'android_dbg': 'android_gyp_debug_bot_arm',
'android_compile_x64_dbg': 'android_gyp_debug_static_bot_x64',
'android_compile_mips_dbg': 'android_gyp_clang_debug_static_bot_mipsel',
'android_dbg': 'android_gyp_debug_static_bot_arm',
'android_rel': 'android_gyp_release_bot_arm',
'android_clang_dbg': 'android_gyp_clang_debug_bot_arm',
'android_clang_dbg': 'android_gyp_clang_debug_static_bot_arm',
'android_arm64_rel': 'android_gyp_release_bot_arm64',
'android_n6': 'android_gyp_debug_bot_arm',
'android_gn_dbg': 'android_gn_debug_bot_arm',
'android_n6': 'android_gyp_debug_static_bot_arm',
'android_gn_dbg': 'android_gn_debug_static_bot_arm',
'android_gn_rel': 'android_gn_release_bot_arm',
},
},
@ -187,35 +187,35 @@
],
# Android
'android_gyp_debug_bot_arm': [
'android', 'gyp', 'debug_bot', 'arm'
'android_gyp_debug_static_bot_arm': [
'android', 'gyp', 'debug_static_bot', 'arm'
],
'android_gyp_release_bot_arm': [
'android', 'gyp', 'release_bot', 'arm'
],
'android_gyp_debug_bot_x86': [
'android', 'gyp', 'debug_bot', 'x86'
'android_gyp_debug_static_bot_x86': [
'android', 'gyp', 'debug_static_bot', 'x86'
],
'android_gyp_release_bot_x86': [
'android', 'gyp', 'release_bot', 'x86'
],
'android_gyp_clang_debug_bot_arm': [
'android', 'gyp', 'clang', 'debug_bot', 'arm'
'android_gyp_clang_debug_static_bot_arm': [
'android', 'gyp', 'clang', 'debug_static_bot', 'arm'
],
'android_gyp_clang_debug_bot_mipsel': [
'android', 'gyp', 'clang', 'debug_bot', 'mipsel'
'android_gyp_clang_debug_static_bot_mipsel': [
'android', 'gyp', 'clang', 'debug_static_bot', 'mipsel'
],
'android_gyp_debug_bot_arm64': [
'android', 'gyp', 'debug_bot', 'arm64'
'android_gyp_debug_static_bot_arm64': [
'android', 'gyp', 'debug_static_bot', 'arm64'
],
'android_gyp_release_bot_arm64': [
'android', 'gyp', 'release_bot', 'arm64'
],
'android_gyp_debug_bot_x64': [
'android', 'gyp', 'debug_bot', 'x64'
'android_gyp_debug_static_bot_x64': [
'android', 'gyp', 'debug_static_bot', 'x64'
],
'android_gn_debug_bot_arm': [
'android', 'gn', 'debug_bot', 'arm'
'android_gn_debug_static_bot_arm': [
'android', 'gn', 'debug_static_bot', 'arm'
],
'android_gn_release_bot_arm': [
'android', 'gn', 'release_bot', 'arm'
@ -277,6 +277,10 @@
'mixins': ['debug', 'shared', 'goma'],
},
'debug_static_bot': {
'mixins': ['debug', 'static', 'minimal_symbols', 'goma'],
},
'device': {
'gn_args': 'ios_enable_code_signing=false',
'gyp_defines': 'chromium_ios_signing=0',
@ -324,6 +328,11 @@
'gyp_defines': 'build_for_tool=memcheck',
},
'minimal_symbols': {
'gn_args': 'symbol_level=1',
'gyp_defines': 'fastbuild=1',
},
'mipsel': {
'gn_args': 'target_cpu="mipsel"',
'gyp_defines': 'target_arch=mipsel',