GN: Merge apk_deps and deps in test() template

testing/test.gni

 # Copyright 2015 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.
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
@@ skipping 10 matching lines @@
       # Configs will always be defined since we set_defaults for a component
       # in the main config. We want to use those rather than whatever came with
       # the nested shared/static library inside the component.
       configs = []  # Prevent list overwriting warning.
       configs = invoker.configs
 
       testonly = true
 
       # Don't use "*" to forward all variables since some (like output_name
       # and isolate_file) apply only to the APK below.
+      deps = []
       forward_variables_from(invoker,
                              [
                                "all_dependent_configs",
                                "allow_circular_includes_from",
                                "cflags",
                                "cflags_c",
                                "cflags_cc",
                                "check_includes",
                                "data",
                                "data_deps",
                                "datadeps",
                                "defines",
+                               "deps",
                                "include_dirs",
                                "ldflags",
                                "lib_dirs",
                                "libs",
                                "output_extension",
                                "output_name",
                                "public",
                                "public_configs",
                                "public_deps",
                                "sources",
                                "visibility",
                              ])
 
-      deps = []
       if (!defined(invoker.use_default_launcher) ||
           invoker.use_default_launcher) {
         deps += [ "//testing/android/native_test:native_test_native_code" ]
       }
-      if (defined(invoker.deps)) {
-        deps += invoker.deps
-      }
     }
 
     unittest_apk(apk_name) {
       forward_variables_from(invoker,
                              [
                                "android_manifest",
+                               "deps",
                                "use_default_launcher",
                                "write_asset_list",
                              ])
-
       unittests_dep = ":$library_name"
       apk_name = main_target_name
       if (defined(invoker.output_name)) {
         apk_name = invoker.output_name
         unittests_binary = "lib${apk_name}.so"
       }
-      deps = [
-        ":$library_name",
-      ]
-      if (defined(invoker.apk_deps)) {
-        deps += invoker.apk_deps
-      }
+      deps += [ ":$library_name" ]
       if (defined(invoker.apk_asset_location)) {
         asset_location = invoker.apk_asset_location
       }
     }
 
     _test_name = main_target_name
     if (defined(invoker.output_name)) {
       _test_name = invoker.output_name
     }
     test_runner_script_name = "${_test_name}__test_runner_script"
@@ skipping 102 matching lines @@
         # All shared libraries must have the sanitizer deps to properly link in
         # asan mode (this target will be empty in other cases).
         "//build/config/sanitizers:deps",
 
         # Give tests the default manifest on Windows (a no-op elsewhere).
         "//build/win:default_exe_manifest",
       ]
     }
   }
 }