android: Make the cmd-line flag file name configurable via a test_runner arg.

It's hard-coded to test-cmdline-file, and some tests appear to have their
own location

R=jbudorick

Bug: 907899
Change-Id: I515bd8d2ff3d91a2f665754708bda94f6c0c19c4
Reviewed-on: https://chromium-review.googlesource.com/c/1357609Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615628}

build/android/pylib/constants/__init__.py

@@ -65,6 +65,11 @@ PACKAGE_INFO.update({
         'org.chromium.chromedriver_webview_shell.Main',
         None,
         None),
+    'android_webview_cts': chrome.PackageInfo(
+        'com.android.webview',
+        'com.android.cts.webkit.WebViewStartupCtsActivity',
+        'webview-command-line',
+        None),
 })
 
 

build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -485,6 +485,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     self._initializeTestFilterAttributes(args)
 
     self._flags = None
+    self._use_apk_under_test_flags_file = False
     self._initializeFlagAttributes(args)
 
     self._driver_apk = None
@@ -659,6 +660,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):
           if a not in requested_annotations)
 
   def _initializeFlagAttributes(self, args):
+    self._use_apk_under_test_flags_file = args.use_apk_under_test_flags_file
     self._flags = ['--enable-test-intents']
     if args.command_line_flags:
       self._flags.extend(args.command_line_flags)
@@ -813,6 +815,10 @@ class InstrumentationTestInstance(test_instance.TestInstance):
   def total_external_shards(self):
     return self._total_external_shards
 
+  @property
+  def use_apk_under_test_flags_file(self):
+    return self._use_apk_under_test_flags_file
+
   @property
   def wait_for_java_debugger(self):
     return self._wait_for_java_debugger

build/android/pylib/instrumentation/instrumentation_test_instance_test.py

@@ -46,13 +46,15 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
         'command_line_flags',
         'device_flags_file',
         'strict_mode',
+        'use_apk_under_test_flags_file'
       ])
 
   def createFlagAttributesArgs(
       self, command_line_flags=None, device_flags_file=None,
-      strict_mode=None):
+      strict_mode=None, use_apk_under_test_flags_file=False):
     return self._FlagAttributesArgs(
-        command_line_flags, device_flags_file, strict_mode)
+        command_line_flags, device_flags_file, strict_mode,
+        use_apk_under_test_flags_file)
 
   def test_initializeFlagAttributes_commandLineFlags(self):
     o = self.createTestInstance()

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -343,8 +343,16 @@ class LocalDeviceInstrumentationTestRun(
 
   def _CreateFlagChangerIfNeeded(self, device):
     if str(device) not in self._flag_changers:
+      cmdline_file = 'test-cmdline-file'
+      if self._test_instance.use_apk_under_test_flags_file:
+        if self._test_instance.package_info:
+          cmdline_file = self._test_instance.package_info.cmdline_file
+        else:
+          logging.warning(
+              'No PackageInfo found, falling back to using flag file %s',
+              cmdline_file)
       self._flag_changers[str(device)] = flag_changer.FlagChanger(
-        device, "test-cmdline-file")
+          device, cmdline_file)
 
   #override
   def _CreateShards(self, tests):

build/android/test_runner.py

@@ -106,6 +106,11 @@ def AddCommandLineOptions(parser):
       type=os.path.realpath,
       help='The relative filepath to a file containing '
            'command-line flags to set on the device')
+  parser.add_argument(
+      '--use-apk-under-test-flags-file',
+      action='store_true',
+      help='Wether to use the flags file for the apk under test. If set, '
+           "the filename will be looked up in the APK's PackageInfo.")
   parser.set_defaults(allow_unknown=True)
   parser.set_defaults(command_line_flags=None)
 

testing/buildbot/gn_isolate_map.pyl

@@ -1431,6 +1431,9 @@
       "--skip-expected-failures",
       "--additional-apk",
       "apks/SystemWebView.apk",
+      "--apk-under-test",
+      "apks/SystemWebView.apk",
+      "--use-apk-under-test-flags-file",
       "-v",
     ],
   },