Commit 5ab8fed2 authored Jun 14, 2010 by Mike Lockwood Committed by Android (Google) Code Review Jun 14, 2010

Merge changes Iac3d757b,Ic31463d2,I27e95c1d,Ibd6e8769

* changes:
  Revert "adb: Use new libusbhost library for USB support on Linux host."
  Revert "adb: remove unnecessary include"
  Revert "adb: Adjust usb_linux.c for changes in libusbhost API."
  Revert "adb: avoid potential race conditions in detecting device disconnects"

parents fc86c58a ac3d757b

adb/Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -80,9 +80,6 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz $(EXTRA_STATIC_LIBS)
		ifeq ($(USE_SYSDEPS_WIN32),)
		LOCAL_STATIC_LIBRARIES += libcutils
		endif
		ifeq ($(HOST_OS),linux)
		LOCAL_STATIC_LIBRARIES += libusbhost
		endif

		include $(BUILD_HOST_EXECUTABLE)

adb/usb_linux.c

+446 −231

File changed.

Preview size limit exceeded, changes collapsed.