MB: Make all Android debug builds static

webrtc/build/mb_config.pyl

Index: webrtc/build/mb_config.pyl
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl
index c036f9af0fa31da6ed2b96890c64ee39f7bbdd48..c990fc3e65fbfbcb756e6df485e7bdc4c1a68675 100644
--- a/webrtc/build/mb_config.pyl
+++ b/webrtc/build/mb_config.pyl
@@ -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',