From 4e17561af22e80438cd255dd5c92d64b57f4955d Mon Sep 17 00:00:00 2001 From: reillyg Date: Thu, 7 Jan 2016 14:00:09 -0800 Subject: Reland of Implement basic USB device enumeration on Android. (patchset #1 id:1 of https://codereview.chromium.org/1561283003/ ) Reason for revert: Lack of GYP dependency on //device/usb Java sources fixed. Original issue's description: > Revert of Implement basic USB device enumeration on Android. (patchset #3 id:40001 of https://codereview.chromium.org/1514603006/ ) > > Reason for revert: > Speculating that this is the cause of issue 575191. > > Original issue's description: > > Implement basic USB device enumeration on Android. > > > > This patch provides a basic implementation of UsbService::GetDevices on > > Android that populates UsbDevice objects by collecting properties of the > > Java-side UsbDevice, UsbConfiguration, UsbInterface and UsbEndpoint > > objects over JNI. > > > > It does not support opening devices and does not generate device add or > > remove notifications. > > > > BUG=549257 > > > > Committed: https://crrev.com/8a310851fb144e91d1777112930ac15c0d88577b > > Cr-Commit-Position: refs/heads/master@{#367918} > > TBR=nasko@chromium.org,qinmin@chromium.org,yfriedman@chromium.org,pfeldman@chromium.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=549257,575191 > > Committed: https://crrev.com/e3de6dea8003be39328bea275763daab36a8df24 > Cr-Commit-Position: refs/heads/master@{#368077} TBR=nasko@chromium.org,qinmin@chromium.org,yfriedman@chromium.org,pfeldman@chromium.org BUG=549257,575191 Review URL: https://codereview.chromium.org/1565313002 Cr-Commit-Position: refs/heads/master@{#368169} --- device/test/run_all_unittests.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'device/test') diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc index b70df54..76a4996 100644 --- a/device/test/run_all_unittests.cc +++ b/device/test/run_all_unittests.cc @@ -11,11 +11,13 @@ #if defined(OS_ANDROID) #include "base/android/jni_android.h" #include "device/bluetooth/android/bluetooth_jni_registrar.h" +#include "device/usb/android/usb_jni_registrar.h" #endif int main(int argc, char** argv) { #if defined(OS_ANDROID) device::android::RegisterBluetoothJni(base::android::AttachCurrentThread()); + device::android::RegisterUsbJni(base::android::AttachCurrentThread()); #endif base::TestSuite test_suite(argc, argv); -- cgit v1.1