Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: device/BUILD.gn

Issue 1465923002: GN: Merge apk_deps and deps in test() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased on formatting change Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") # For generate_jni(). 9 import("//build/config/android/rules.gni") # For generate_jni().
10 } 10 }
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 # UsbContext is a libusb-specific object. 133 # UsbContext is a libusb-specific object.
134 if (!is_android && !is_ios) { 134 if (!is_android && !is_ios) {
135 sources += [ "usb/usb_context_unittest.cc" ] 135 sources += [ "usb/usb_context_unittest.cc" ]
136 } 136 }
137 137
138 if (is_android) { 138 if (is_android) {
139 sources -= [ "battery/battery_status_service_unittest.cc" ] 139 sources -= [ "battery/battery_status_service_unittest.cc" ]
140 deps -= [ "//device/battery" ] 140 deps -= [ "//device/battery" ]
141 deps += [ ":bluetooth_test_jni_headers" ] 141 deps += [ ":bluetooth_test_jni_headers" ]
142 apk_deps = [ ":bluetooth_test_java" ] 142 deps += [ ":bluetooth_test_java" ]
tfarina 2015/11/20 18:56:06 merge with the above one?
agrieve 2015/11/20 20:06:14 Done.
143 } 143 }
144 144
145 if (is_chromeos) { 145 if (is_chromeos) {
146 deps += [ 146 deps += [
147 "//chromeos", 147 "//chromeos",
148 "//chromeos:test_support", 148 "//chromeos:test_support",
149 "//chromeos:test_support_without_gmock", 149 "//chromeos:test_support_without_gmock",
150 ] 150 ]
151 } 151 }
152 152
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 196 }
197 197
198 android_library("bluetooth_test_java") { 198 android_library("bluetooth_test_java") {
199 java_files = bluetooth_java_sources_needing_jni 199 java_files = bluetooth_java_sources_needing_jni
200 deps = [ 200 deps = [
201 "//base:base_java", 201 "//base:base_java",
202 "//device/bluetooth:java", 202 "//device/bluetooth:java",
203 ] 203 ]
204 } 204 }
205 } 205 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698