🏆 Allow Android test wrapper scripts to specify their timeouts in GN/GYP

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 8c51208c1573d4141ac0286b108dd9bdd5351f51..54ef856bcc804d4d1c44da17729a8c3d5dd69801 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1581,6 +1581,7 @@
             'isolate_file': 'net_unittests.isolate',
             'android_manifest_path': 'android/unittest_support/AndroidManifest.xml',
             'resource_dir': 'android/unittest_support/res',
+            'shard_timeout': 300,

[xunjieli, 2016/04/12 02:13:17]

Are these numbers same as what we have on all the bots?

[xunjieli, 2016/04/12 02:18:51]

where does "300" come from? Why does cronet_unittests has timeout as 180
instead?

[agrieve, 2016/04/12 02:33:37]

Good question.

Cronet & net are run here with a timeout of 180:
https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/re...

But net is run here with a timeout of 300:
https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/re...

So I used the bigger of the two (not positive that's the correct thing to do)

[xunjieli, 2016/04/12 02:40:28]

I see. I remembered there was some issue with timeouts (Some net unittests take
more than 100s. See crbug.com/540939). Since these timeout values are current
ones, so I think this will be fine.

             'conditions': [
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',