Run bundle smoke tests in CQ (L,M) and waterfall (N,O,P)

+ Add a Chrome modern bundle smoke test runner so that we have a target
  for CQ tests.

Bug: 989655
Change-Id: I036a8b7e4096be69bddc2a7b76af201caf51cd74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790342
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695441}

build/android/BUILD.gn

@@ -85,6 +85,7 @@ python_library("test_runner_py") {
     "${android_sdk_build_tools}/lib64/libc++.so",
     "${android_sdk_build_tools}/split-select",
     "${android_sdk_root}/platform-tools/adb",
+    "//third_party/android_build_tools/bundletool/bundletool-all-0.10.3.jar",
   ]
   data_deps = [
     ":devil_chromium_py",

build/config/android/rules.gni

@@ -4770,9 +4770,6 @@ if (enable_java_templates) {
       outputs = [
         _bundle_path,
       ]
-      data = [
-        _bundle_path,
-      ]
       deps = _all_create_module_targets + [ ":$_build_config_target" ]
       args = [
         "--out-bundle=$_rebased_bundle_path",
@@ -4859,6 +4856,7 @@ if (enable_java_templates) {
         _bundle_wrapper_script_path,
         _android_aapt2_path,
         _keystore_path,
+        _bundle_path,
       ]
       data_deps = [
         "//build/android:bundle_wrapper_script_py",
@@ -4928,6 +4926,9 @@ if (enable_java_templates) {
       outputs = [
         _apks_path,
       ]
+      data = [
+        _apks_path,
+      ]
       args = [
         "--bundle",
         _rebased_bundle_path,

chrome/android/BUILD.gn

@@ -2096,7 +2096,7 @@ android_test_apk("chrome_smoke_test_apk") {
   apk_name = "ChromeSmokeTest"
   android_manifest =
       "javatests/src/org/chromium/chrome/test/smoke/AndroidManifest.xml"
-  target_sdk_version = 28
+  target_sdk_version = android_sdk_version
   testonly = true
   java_files =
       [ "javatests/src/org/chromium/chrome/test/smoke/ChromeSmokeTest.java" ]
@@ -2133,7 +2133,7 @@ android_test_apk("chrome_bundle_smoke_test_apk") {
   apk_name = "ChromeBundleSmokeTest"
   android_manifest =
       "javatests/src/org/chromium/chrome/test/smoke/AndroidManifest_bundle.xml"
-  target_sdk_version = 28
+  target_sdk_version = android_sdk_version
   testonly = true
   java_files = [
     "javatests/src/org/chromium/chrome/test/smoke/ChromeBundleSmokeTest.java",
@@ -2148,23 +2148,34 @@ android_test_apk("chrome_bundle_smoke_test_apk") {
   ]
 }
 
+_bundle_smoke_test_extra_args = [
+  # Make extra args be passed through to the bundle under test (see below).
+  "--use-apk-under-test-flags-file",
+
+  # Chrome crashes at startup if strict mode is turned on.
+  "--strict-mode=off",
+
+  # These args are passed through to the bundle under test.
+  "--enable-test-dummy-module",
+  "--disable-fre",
+]
+
+instrumentation_test_runner("chrome_modern_public_bundle_smoke_test") {
+  apk_under_test = ":chrome_modern_public_bundle_apks"
+  android_test_apk = ":chrome_bundle_smoke_test_apk"
+  android_test_apk_name = "ChromeBundleSmokeTest"
+  never_incremental = true
+  modules = [ "test_dummy" ]
+  extra_args = _bundle_smoke_test_extra_args
+}
+
 instrumentation_test_runner("monochrome_public_bundle_smoke_test") {
   apk_under_test = "//chrome/android:monochrome_public_bundle_apks"
   android_test_apk = ":chrome_bundle_smoke_test_apk"
   android_test_apk_name = "ChromeBundleSmokeTest"
   never_incremental = true
   modules = [ "test_dummy" ]
-  extra_args = [
-    # Make extra args be passed through to the bundle under test (see below).
-    "--use-apk-under-test-flags-file",
-
-    # Chrome crashes at startup if strict mode is turned on.
-    "--strict-mode=off",
-
-    # These args are passed through to the bundle under test.
-    "--enable-test-dummy-module",
-    "--disable-fre",
-  ]
+  extra_args = _bundle_smoke_test_extra_args
 }
 
 if (defined(expected_static_initializer_count)) {

testing/buildbot/chromium.android.fyi.json

@@ -1313,6 +1313,62 @@
         },
         "test": "cc_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices",
+          "--avd-name=20190903T160000Z_android_23_google_apis_x86",
+          "--emulator-home=../../.android"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "chrome_modern_public_bundle_smoke_test"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/third_party/android_sdk/public/avds/android-23/google_apis/x86",
+              "location": ".android",
+              "revision": "cfoclSzHrFOS_AcwBL09RQ5PvJByQHu3MX6EbC5aWZIC"
+            },
+            {
+              "cipd_package": "chromium/third_party/android_sdk/public/emulator",
+              "location": "third_party/android_sdk/public",
+              "revision": "f4WdgkPvDdVCE8zBWPzcSIj4N9WFhKp3CSKDWylXuLEC"
+            },
+            {
+              "cipd_package": "chromium/third_party/android_sdk/public/system-images/android-23/google_apis/x86",
+              "location": "third_party/android_sdk/public",
+              "revision": "npuCAATVbhmywZwGhI3tMoECTrBBzzyJLpjAPXqtmYYC"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "device_os": null,
+              "device_type": null,
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "chrome_modern_public_bundle_smoke_test"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/chromium.fyi.json

@@ -4922,6 +4922,51 @@
         },
         "test": "cc_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "isolate_coverage_data": true,
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "chrome_modern_public_bundle_smoke_test"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_os_type": "userdebug",
+              "device_type": "bullhead",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "chrome_modern_public_bundle_smoke_test"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/gn_isolate_map.pyl

@@ -624,6 +624,10 @@
     "label": "//chrome/android:chrome_modern_public_smoke_test",
     "type": "console_test_launcher",
   },
+  "chrome_modern_public_bundle_smoke_test": {
+    "label": "//chrome/android:chrome_modern_public_bundle_smoke_test",
+    "type": "console_test_launcher",
+  },
   "chrome_official_builder": {
     "label": "//:chrome_official_builder",
     "type": "additional_compile_target",
@@ -1744,6 +1748,10 @@
     "label": "//chrome/android:monochrome_public_smoke_test",
     "type": "console_test_launcher",
   },
+  "monochrome_public_bundle_smoke_test": {
+    "label": "//chrome/android:monochrome_public_bundle_smoke_test",
+    "type": "console_test_launcher",
+  },
   "mojo_core_channel_fuzzer": {
     "label": "//mojo/core:mojo_core_channel_fuzzer",
     "type": "fuzzer",

testing/buildbot/test_suites.pyl

@@ -83,10 +83,12 @@
 
     'android_modern_smoke_tests': {
       'chrome_modern_public_smoke_test': {},
+      'chrome_modern_public_bundle_smoke_test': {},
     },
 
     'android_monochrome_smoke_tests': {
       'monochrome_public_smoke_test': {},
+      'monochrome_public_bundle_smoke_test': {},
     },
 
     'android_oreo_standard_gtests': {