GN: Update tests to have the correct shard timeout value on Android.

webrtc/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
@@ skipping 584 matching lines @@
       ]
 
       # TODO(tkchin): Cleanup this warning.
       cflags = [ "-Wno-objc-property-no-attribute" ]
 
       # |-ObjC| flag needed to make sure category method implementations
       # are included:
       # https://developer.apple.com/library/mac/qa/qa1490/_index.html
       ldflags = [ "-ObjC" ]
     }
+
+    if (is_android) {
+      shard_timeout = 900

[kjellander_webrtc, 2016/08/15 06:55:08]

Please put this at line 581 instead.

[sakal, 2016/08/15 07:44:54]

Done.

+    }
   }
 
   test("xmllite_xmpp_unittests") {
     configs += [
       ":common_config",
       ":rtc_unittests_config",
     ]
     public_configs = [ ":common_inherited_config" ]
 
     if (is_clang) {
@@ skipping 43 matching lines @@
       "modules/video_capture",
       "test:test_common",
       "test:test_main",
       "video:video_tests",
     ]
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
+
+    if (is_android) {
+      shard_timeout = 900

[kjellander_webrtc, 2016/08/15 06:55:08]

Hmm, this test was added in https://codereview.webrtc.org/2064523002 but it
doesn't seem to have the necessary stuff to run on Android in its GN version.
Could you also 
1) add:
deps += [ "//testing/android/native_test:native_test_native_code" ]
2) add data entries for the two resource files listed in
https://cs.chromium.org/chromium/src/third_party/webrtc/video_engine_tests.is...
?

It's OK to do this work in a separate CL though, since it widens the scope of
this one. Also feel free to delegate to somebody else with a bug.

[sakal, 2016/08/15 07:44:54]

Acknowledged.

+    }
   }
 
   source_set("video_quality_test") {
     testonly = true
     configs += [ ":common_config" ]
     public_configs = [ ":common_inherited_config" ]
     sources = [
       "video/video_quality_test.cc",
       "video/video_quality_test.h",
     ]
@@ skipping 46 matching lines @@
       "//testing/gtest",
     ]
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
     }
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
+    if (is_android) {
+      shard_timeout = 2700

[kjellander_webrtc, 2016/08/15 06:55:08]

Please move to line 736.

[sakal, 2016/08/15 07:44:54]

Done.

+    }
   }
 
   test("webrtc_nonparallel_tests") {
     testonly = true
     configs += [
       ":common_config",
       ":rtc_unittests_config",
     ]
     public_configs = [ ":common_inherited_config" ]
     sources = [
@@ skipping 20 matching lines @@
       sources += [ "base/macsocketserver_unittest.cc" ]
     }
     if (is_ios || (is_mac && target_cpu != "x86")) {
       defines = [ "CARBON_DEPRECATED=YES" ]
     }
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
+    if (is_android) {
+      shard_timeout = 900

[kjellander_webrtc, 2016/08/15 06:55:08]

Please move to line 772.

[sakal, 2016/08/15 07:44:54]

Done.

+    }
   }
 }