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

Side by Side Diff: device/BUILD.gn

Issue 2017273002: Support USB device hotplug on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add dependency on //device/usb:java. Created 4 years, 6 months 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
« no previous file with comments | « no previous file | device/usb/android/java/src/org/chromium/device/usb/ChromeUsbDevice.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 if (is_mac || is_win) { 143 if (is_mac || is_win) {
144 sources += [ "usb/usb_context_unittest.cc" ] 144 sources += [ "usb/usb_context_unittest.cc" ]
145 deps += [ "//third_party/libusb" ] 145 deps += [ "//third_party/libusb" ]
146 } 146 }
147 147
148 if (is_android) { 148 if (is_android) {
149 sources -= [ "battery/battery_status_service_unittest.cc" ] 149 sources -= [ "battery/battery_status_service_unittest.cc" ]
150 deps += [ 150 deps += [
151 ":bluetooth_test_java", 151 ":bluetooth_test_java",
152 ":bluetooth_test_jni_headers", 152 ":bluetooth_test_jni_headers",
153 "//device/usb:java",
153 ] 154 ]
154 deps -= [ "//device/battery" ] 155 deps -= [ "//device/battery" ]
155 } 156 }
156 157
157 if (is_chromeos) { 158 if (is_chromeos) {
158 deps += [ 159 deps += [
159 "//chromeos", 160 "//chromeos",
160 "//chromeos:test_support", 161 "//chromeos:test_support",
161 "//chromeos:test_support_without_gmock", 162 "//chromeos:test_support_without_gmock",
162 ] 163 ]
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 } 220 }
220 221
221 android_library("bluetooth_test_java") { 222 android_library("bluetooth_test_java") {
222 java_files = bluetooth_java_sources_needing_jni 223 java_files = bluetooth_java_sources_needing_jni
223 deps = [ 224 deps = [
224 "//base:base_java", 225 "//base:base_java",
225 "//device/bluetooth:java", 226 "//device/bluetooth:java",
226 ] 227 ]
227 } 228 }
228 } 229 }
OLDNEW
« no previous file with comments | « no previous file | device/usb/android/java/src/org/chromium/device/usb/ChromeUsbDevice.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698