weblayer: skew test changes

Updates text in script.
Changes gn args to provide more debugging information.
Updates version used for 85.

BUG=none
TEST=test only changes

Change-Id: Ibf18a9c829a3e1f7c4463ebfa68ba7d889a1614a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472438Reviewed-by: Rakib Hasan <rmhasan@google.com>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817157}

testing/buildbot/chromium.android.fyi.json

@@ -3255,7 +3255,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M85",
-              "revision": "version:85.0.4183.81"
+              "revision": "version:85.0.4183.140"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",

testing/buildbot/variants.pyl

@@ -348,7 +348,7 @@
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
           'location': 'weblayer_instrumentation_test_M85',
-          'revision': 'version:85.0.4183.81',
+          'revision': 'version:85.0.4183.140',
         }
       ],
     },

weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py

@@ -7,11 +7,12 @@
 # Script to build a CIPD package for weblayer_instrumentation_test_apk from
 # the current Chromium checkout.
 #
-# This should be run from the src directory of a release branch. After the
-# package is built the user should run two cipd commands (printed at the end
-# of script execution) to upload the package to the CIPD server and to update
-# the ref for the corresponding milestone. Once the ref is updated, the version
-# skew test will pick up the new package in successive runs.
+# This should be run from the src directory of a release branch. This will
+# take care of the build, you need not do that yourself. After the package is
+# built run two cipd commands (printed at the end of script execution) to
+# upload the package to the CIPD server and to update the ref for the
+# corresponding milestone. Once the ref is updated, the version skew test will
+# pick up the new package in successive runs.
 
 import argparse
 import contextlib
@@ -138,7 +139,7 @@ def main():
     print('Use "cipd set-ref chromium/testing/weblayer-x86 --version ' +
           '<CIPD instance version> -ref m<milestone>" to update the ref.')
     print('The CIPD instance version can be found on the "Instance" line ' +
-          'above after "chromium/testing/weblayer-x86:".')
+          'after "chromium/testing/weblayer-x86:".')
 
 
 if __name__ == '__main__':

weblayer/browser/android/javatests/skew/mb_config.pyl

@@ -21,7 +21,7 @@
   'configs': {
     'android_release_bot_minimal_symbols_x86_webview_google': [
       'android', 'release_bot', 'minimal_symbols', 'x86',
-      'strip_debug_info', 'webview_google',
+      'strip_debug_info', 'webview_google', 'improved_debugging',
     ],
   },
 
@@ -85,5 +85,9 @@
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
+
+    'improved_debugging': {
+      'gn_args': 'is_java_debug=true dcheck_always_on=true',
+    },
   },
 }