Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 90b6253fb09409b954ee68e16c6f95c8d4f4b050
commit90b6253fb09409b954ee68e16c6f95c8d4f4b050[log] [tgz]
authorJosh Gao <jmgao@google.com>Wed May 10 13:51:36 2017 -0700
committerJosh Gao <jmgao@google.com>Wed May 10 13:58:51 2017 -0700
tree5abeb975414a2eee4d7b13a67fc6bba8b2058e2c
parent61a4c2c69ce5568d36427c9539435db484d46cac [diff]
adb: fix darwin build break.

Fix the following build breakage:

    system/core/adb/client/usb_osx.cpp:433:13: error: static declaration of 'usb_cleanup' follows non-static declaration
    static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
                ^
    system/core/adb/usb.h:48:5: note: previous declaration is here
        ADB_USB_INTERFACE(native::usb_handle*);

Bug: http://b/38203892
Test: mma on linux, darwin
Change-Id: I1c042e4d64ddcc0713f329202bc2037e590a9b4f
3 files changed
tree: 5abeb975414a2eee4d7b13a67fc6bba8b2058e2c
  1. client/
  2. daemon/
  3. sysdeps/
  4. .clang-format ⇨ ../.clang-format-4
  5. adb.cpp
  6. adb.h
  7. adb_auth.h
  8. adb_auth_host.cpp
  9. adb_client.cpp
  10. adb_client.h
  11. adb_io.cpp
  12. adb_io.h
  13. adb_io_test.cpp
  14. adb_listeners.cpp
  15. adb_listeners.h
  16. adb_listeners_test.cpp
  17. adb_mdns.h
  18. adb_trace.cpp
  19. adb_trace.h
  20. adb_unique_fd.h
  21. adb_utils.cpp
  22. adb_utils.h
  23. adb_utils_test.cpp
  24. adbd_auth.cpp
  25. Android.mk
  26. bugreport.cpp
  27. bugreport.h
  28. bugreport_test.cpp
  29. commandline.cpp
  30. commandline.h
  31. console.cpp
  32. CPPLINT.cfg
  33. diagnose_usb.cpp
  34. diagnose_usb.h
  35. fdevent.cpp
  36. fdevent.h
  37. fdevent_test.cpp
  38. fdevent_test.h
  39. file_sync_client.cpp
  40. file_sync_service.cpp
  41. file_sync_service.h
  42. framebuffer_service.cpp
  43. jdwp_service.cpp
  44. line_printer.cpp
  45. line_printer.h
  46. MODULE_LICENSE_APACHE2
  47. NOTICE
  48. OVERVIEW.TXT
  49. protocol.txt
  50. remount_service.cpp
  51. remount_service.h
  52. security_log_tags.h
  53. services.cpp
  54. services.h
  55. SERVICES.TXT
  56. set_verity_enable_state_service.cpp
  57. shell_service.cpp
  58. shell_service.h
  59. shell_service_protocol.cpp
  60. shell_service_protocol_test.cpp
  61. shell_service_test.cpp
  62. socket.h
  63. socket_spec.cpp
  64. socket_spec.h
  65. socket_spec_test.cpp
  66. socket_test.cpp
  67. sockets.cpp
  68. sockets.dia
  69. SYNC.TXT
  70. sysdeps.h
  71. sysdeps_test.cpp
  72. sysdeps_unix.cpp
  73. sysdeps_win32.cpp
  74. sysdeps_win32_test.cpp
  75. test_adb.py
  76. test_device.py
  77. trace.sh
  78. transport.cpp
  79. transport.h
  80. transport_local.cpp
  81. transport_mdns.cpp
  82. transport_mdns_unsupported.cpp
  83. transport_test.cpp
  84. transport_usb.cpp
  85. usb.h