GN: Merge apk_deps and deps in test() template

device/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")  # For generate_jni().
 }
@@ skipping 121 matching lines @@
 
   # UsbContext is a libusb-specific object.
   if (!is_android && !is_ios) {
     sources += [ "usb/usb_context_unittest.cc" ]
   }
 
   if (is_android) {
     sources -= [ "battery/battery_status_service_unittest.cc" ]
     deps -= [ "//device/battery" ]
     deps += [ ":bluetooth_test_jni_headers" ]
-    apk_deps = [ ":bluetooth_test_java" ]
+    deps += [ ":bluetooth_test_java" ]

[tfarina, 2015/11/20 18:56:06]

merge with the above one?

[agrieve, 2015/11/20 20:06:14]

Done.

   }
 
   if (is_chromeos) {
     deps += [
       "//chromeos",
       "//chromeos:test_support",
       "//chromeos:test_support_without_gmock",
     ]
   }
 
@@ skipping 43 matching lines @@
   }
 
   android_library("bluetooth_test_java") {
     java_files = bluetooth_java_sources_needing_jni
     deps = [
       "//base:base_java",
       "//device/bluetooth:java",
     ]
   }
 }