summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-12-01 08:36:19 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-01 16:37:49 +0000
commit97176368ff8be424d349132778d9c27624a1232d (patch)
treef8fd18b17a2ed85b2a221052f8614a31b9b618cb /device
parent0d94fda8c494d7a6c27d065d782f42e99d834f46 (diff)
downloadchromium_src-97176368ff8be424d349132778d9c27624a1232d.zip
chromium_src-97176368ff8be424d349132778d9c27624a1232d.tar.gz
chromium_src-97176368ff8be424d349132778d9c27624a1232d.tar.bz2
GN: Merge apk_deps and deps in test() template
apk_deps has been causing some unneccesary confusion. BUG=558193 R=tfarina@chromium.org,brettw@chromium.org Review URL: https://codereview.chromium.org/1465923002 Cr-Commit-Position: refs/heads/master@{#362432}
Diffstat (limited to 'device')
-rw-r--r--device/BUILD.gn6
1 files changed, 4 insertions, 2 deletions
diff --git a/device/BUILD.gn b/device/BUILD.gn
index e4f56a5..5c53606 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -138,9 +138,11 @@ test("device_unittests") {
if (is_android) {
sources -= [ "battery/battery_status_service_unittest.cc" ]
+ deps += [
+ ":bluetooth_test_java",
+ ":bluetooth_test_jni_headers",
+ ]
deps -= [ "//device/battery" ]
- deps += [ ":bluetooth_test_jni_headers" ]
- apk_deps = [ ":bluetooth_test_java" ]
}
if (is_chromeos) {