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

Unified Diff: device/usb/BUILD.gn

Issue 1561283003: Revert of Implement basic USB device enumeration on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/test/run_all_unittests.cc ('k') | device/usb/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/BUILD.gn
diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn
index 6adc36f4f58b10c2ba508e16687749256edf357f..99e12caeb42589d00f2e333214304b2efd488310 100644
--- a/device/usb/BUILD.gn
+++ b/device/usb/BUILD.gn
@@ -6,39 +6,23 @@
assert(!is_ios)
-if (is_android) {
- import("//build/config/android/rules.gni") # For generate_jni().
-}
-
source_ids = "//third_party/usb_ids/usb.ids"
generated_ids = "$target_gen_dir/usb_ids_gen.cc"
source_set("usb") {
sources = [
- "android/usb_jni_registrar.cc",
- "android/usb_jni_registrar.h",
- "usb_configuration_android.cc",
- "usb_configuration_android.h",
"usb_descriptors.cc",
"usb_descriptors.h",
"usb_device.cc",
"usb_device.h",
- "usb_device_android.cc",
- "usb_device_android.h",
"usb_device_filter.cc",
"usb_device_filter.h",
"usb_device_handle.cc",
"usb_device_handle.h",
- "usb_endpoint_android.cc",
- "usb_endpoint_android.h",
"usb_ids.cc",
"usb_ids.h",
- "usb_interface_android.cc",
- "usb_interface_android.h",
"usb_service.cc",
"usb_service.h",
- "usb_service_android.cc",
- "usb_service_android.h",
"webusb_descriptors.cc",
"webusb_descriptors.h",
generated_ids,
@@ -58,7 +42,10 @@
}
if (is_android) {
- deps += [ ":jni_headers" ]
+ sources += [
+ "usb_service_android.cc",
+ "usb_service_android.h",
+ ]
} else {
sources += [
"usb_context.cc",
@@ -124,32 +111,3 @@
# Only the device_usb target can depend on us.
visibility = [ ":usb" ]
}
-
-if (is_android) {
- java_sources_needing_jni = [
- "android/java/src/org/chromium/device/usb/ChromeUsbConfiguration.java",
- "android/java/src/org/chromium/device/usb/ChromeUsbDevice.java",
- "android/java/src/org/chromium/device/usb/ChromeUsbEndpoint.java",
- "android/java/src/org/chromium/device/usb/ChromeUsbInterface.java",
- "android/java/src/org/chromium/device/usb/ChromeUsbService.java",
- ]
-
- generate_jni("jni_headers") {
- sources = java_sources_needing_jni
- jni_package = "device"
- }
-
- java_cpp_enum("usb_descriptors_javagen") {
- sources = [
- "usb_descriptors.h",
- ]
- }
-
- android_library("java") {
- java_files = java_sources_needing_jni
- deps = [
- "//base:base_java",
- ]
- srcjar_deps = [ ":usb_descriptors_javagen" ]
- }
-}
« no previous file with comments | « device/test/run_all_unittests.cc ('k') | device/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698