Add missing data dependency for chrome_java_test_wpr_tests

Add more logging into test runner.


Bug: 1060399
Change-Id: I4bdc9ac8413f8ea04433ae927106f73d94788330
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2253083
Commit-Queue: Arthur Wang <wuwang@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791091}

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

@@ -590,8 +590,11 @@ class LocalDeviceInstrumentationTestRun(
       wpr_archive_path = os.path.join(host_paths.DIR_SOURCE_ROOT,
                                       wpr_archive_relative_path)
       if not os.path.isdir(wpr_archive_path):
-        raise RuntimeError('WPRArchiveDirectory annotation should point'
-                           'to a directory only.')
+        raise RuntimeError('WPRArchiveDirectory annotation should point '
+                           'to a directory only. '
+                           '{0} exist: {1}'.format(
+                               wpr_archive_path,
+                               os.path.exists(wpr_archive_path)))
 
       archive_path = os.path.join(wpr_archive_path,
                                   self._GetUniqueTestName(test) + '.wprgo')

build/config/android/rules.gni

@@ -3315,10 +3315,13 @@ if (enable_java_templates) {
             _static_library_apk_path,
           ]
         }
+        if (!defined(data)) {
+          data = []
+        }
         if (_proguard_enabled && !_incremental_apk) {
           # Required by logcat command.
           data_deps += [ "//build/android/stacktrace:java_deobfuscate" ]
-          data = [ "$_final_apk_path.mapping" ]
+          data += [ "$_final_apk_path.mapping" ]
           args += [
             "--proguard-mapping-path",
             rebase_path("$_final_apk_path.mapping", root_build_dir),

chrome/test/android/BUILD.gn

@@ -84,6 +84,7 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
   apk_under_test = "//chrome/android:chrome_public_apk"
   android_manifest = "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/network_fetch/AndroidManifest.xml"
   sources = [ "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/network_fetch/FeedNewTabPageCardInstrumentationTest.java" ]
+  data = [ "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/wpr_tests" ]
   deps = [
     ":chrome_java_test_support",
     "//base:base_java",

chrome/test/data/android/manage_wpr_archives.py

@@ -23,7 +23,7 @@ WPR_RECORD_REPLAY_TEST_DIRECTORIES = [
 
 
 def _is_file_of_interest(f):
-  """Filter all wprgo archive file through."""
+  """Filters all wprgo archive file through."""
   return f.endswith('.wprgo')