summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2016-03-25 13:33:59 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 20:36:05 +0000
commit348a13d830f6f7e3c3f73f97c0f7f206bc3763fa (patch)
tree717521b92a944bf2a2c40a13af75aa628361325a
parent5fc1fc6ee3eff5dcae89926d13a86452599cfb98 (diff)
downloadchromium_src-348a13d830f6f7e3c3f73f97c0f7f206bc3763fa.zip
chromium_src-348a13d830f6f7e3c3f73f97c0f7f206bc3763fa.tar.gz
chromium_src-348a13d830f6f7e3c3f73f97c0f7f206bc3763fa.tar.bz2
[cronet] Switch android_cronet_tester to static_library.
BUG=597596 Review URL: https://codereview.chromium.org/1838433002 Cr-Commit-Position: refs/heads/master@{#383344}
-rw-r--r--tools/mb/mb_config.pyl8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 6417815..31f1c76 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -652,7 +652,9 @@
'android_compile_rel': 'swarming_android_gyp_release_trybot',
'android_compile_x64_dbg': 'android_gn_debug_trybot_x64',
'android_compile_x86_dbg': 'android_gn_debug_trybot_x86',
- 'android_cronet_tester': 'android_cronet_gyp_debug_trybot',
+ # TODO(crbug/597596): Switch this back to debug_trybot when cronet's
+ # shared library loading is fixed.
+ 'android_cronet_tester': 'android_cronet_gyp_debug_static_bot',
'linux_android_dbg_ng': 'swarming_android_gyp_debug_trybot',
'linux_android_rel_ng': 'swarming_android_gyp_release_trybot',
},
@@ -871,10 +873,6 @@
'android', 'cronet', 'gyp', 'debug_static_bot', 'x86'
],
- 'android_cronet_gyp_debug_trybot': [
- 'android', 'cronet', 'gyp', 'debug_trybot'
- ],
-
'android_cronet_gyp_release_bot_minimal_symbols': [
'android', 'cronet', 'gyp', 'release_bot_minimal_symbols', 'arm'
],