Convert mojo_test_apk android_apk->instrumentation_test_apk

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1981 matching lines @@
         (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   }
 
   group(target_name) {
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
-      invoker.apk_under_test,
     ]
+    if (defined(invoker.apk_under_test)) {
+      public_deps += [ invoker.apk_under_test ]
+    }
   }
   group("${target_name}_incremental") {
     public_deps = [
       ":${_apk_target_name}_dist_ijar",
       ":${_apk_target_name}_incremental",
       ":${_test_runner_target_name}_incremental",
-      "${invoker.apk_under_test}_incremental",
     ]
+    if (defined(invoker.apk_under_test)) {
+      public_deps += [ "${invoker.apk_under_test}_incremental" ]
+    }
   }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
 #     the underlying android_apk invocation and should include the java and
@@ skipping 298 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }