Android: Add trichrome bundle smoke tests

Once we have a Q bot these can go on the CQ.

Bug: 1012819
Change-Id: Ia8dd3eff4aaf239db80676e832cb2b936ad6bfc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943096
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721688}

build/config/android/rules.gni

@@ -3706,6 +3706,9 @@ if (enable_java_templates) {
       if (defined(invoker.apk_under_test)) {
         public_deps += [ invoker.apk_under_test ]
       }
+      if (defined(invoker.additional_apks)) {
+        public_deps += invoker.additional_apks
+      }
     }
   }
 

chrome/android/BUILD.gn

@@ -2155,6 +2155,11 @@ android_test_apk("chrome_bundle_smoke_test_apk") {
   java_files = [
     "javatests/src/org/chromium/chrome/test/smoke/ChromeBundleSmokeTest.java",
   ]
+
+  # Used as test_apk for bundle smoke tests, which are also never_incremental.
+  # The test_runner_script target does not support incremental test_apk when
+  # the parent target is never_incremental.
+  never_incremental = true
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
@@ -2249,6 +2254,27 @@ if (public_android_sdk) {
   }
 }
 
+instrumentation_test_runner("trichrome_chrome_bundle_smoke_test") {
+  apk_under_test = "//chrome/android:trichrome_chrome_bundle_apks"
+  android_test_apk = ":chrome_bundle_smoke_test_apk"
+  android_test_apk_name = "ChromeBundleSmokeTest"
+  never_incremental = true
+  modules = [ "test_dummy" ]
+  additional_apks = [ "//chrome/android:trichrome_library_apk" ]
+  extra_args = _bundle_smoke_test_extra_args
+}
+
+instrumentation_test_runner("trichrome_chrome_bundle_fake_modules_smoke_test") {
+  apk_under_test = "//chrome/android:trichrome_chrome_bundle_apks"
+  android_test_apk = ":chrome_bundle_smoke_test_apk"
+  android_test_apk_name = "ChromeBundleSmokeTest"
+  never_incremental = true
+  fake_modules = [ "test_dummy" ]
+  additional_apks = [ "//chrome/android:trichrome_library_apk" ]
+  extra_args =
+      _bundle_smoke_test_extra_args + _bundle_fake_modules_smoke_test_extra_args
+}
+
 group("chrome_public_wpt") {
   testonly = true
   data_deps = [

chrome/android/trichrome.gni

@@ -71,6 +71,11 @@ template("trichrome_library_apk_tmpl") {
       app_as_shared_lib = true
     }
 
+    # No support for this has been added, also not supported by test runner
+    # since trichrome library is used in "additional_apks" in the trichrome
+    # bundle smoke tests.
+    never_incremental = true
+
     uncompress_shared_libraries = true
     uncompress_dex = true
     version_name = chrome_version_name