Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_packages_modules_adb / da5b30b9f15c8f335925a6945e477aa02043ba30
commitda5b30b9f15c8f335925a6945e477aa02043ba30[log] [tgz]
authorJosh Gao <jmgao@google.com>Fri Feb 21 16:38:29 2020 -0800
committerJosh Gao <jmgao@google.com>Mon Feb 24 17:58:21 2020 -0800
tree71a79f914c2dc335a5fb90e0581648480295ed4b
parent7f99d32735839f6e8aaa6a9c8273ab465e61bd8b [diff]
adbd: fix build breakage.

This broke because two CLs touching the Android.bp file both
independently passed presubmit, but failed when combined.

Clean up a misindentation while we're at it.

Bug: http://b/150032044
Bug: http://b/150032367
Test: mma in system/core/adb
Change-Id: I091ef9dec806c767ffb21a5fd73b2bb37ab29ff9
Merged-In: I091ef9dec806c767ffb21a5fd73b2bb37ab29ff9
(cherry picked from commit 6d949e89a47e4876b835fe95d3299699da0bba92)
1 file changed
tree: 71a79f914c2dc335a5fb90e0581648480295ed4b
  1. apex/
  2. client/
  3. crypto/
  4. daemon/
  5. fastdeploy/
  6. fdevent/
  7. libs/
  8. pairing_auth/
  9. pairing_connection/
  10. proto/
  11. sysdeps/
  12. tls/
  13. tools/
  14. .clang-format ⇨ ../.clang-format-4
  15. adb.bash
  16. adb.cpp
  17. adb.h
  18. adb_auth.h
  19. adb_integration_test_adb.xml
  20. adb_integration_test_device.xml
  21. adb_io.cpp
  22. adb_io.h
  23. adb_io_test.cpp
  24. adb_listeners.cpp
  25. adb_listeners.h
  26. adb_listeners_test.cpp
  27. adb_mdns.h
  28. adb_trace.cpp
  29. adb_trace.h
  30. adb_unique_fd.cpp
  31. adb_unique_fd.h
  32. adb_utils.cpp
  33. adb_utils.h
  34. adb_utils_test.cpp
  35. adb_wifi.h
  36. Android.bp
  37. benchmark_device.py
  38. bugreport_test.cpp
  39. file_sync_protocol.h
  40. MODULE_LICENSE_APACHE2
  41. NOTICE
  42. OVERVIEW.TXT
  43. OWNERS
  44. protocol.txt
  45. security_log_tags.h
  46. services.cpp
  47. services.h
  48. SERVICES.TXT
  49. shell_protocol.h
  50. shell_service_protocol.cpp
  51. shell_service_protocol_test.cpp
  52. SOCKET-ACTIVATION.txt
  53. socket.h
  54. socket_spec.cpp
  55. socket_spec.h
  56. socket_spec_test.cpp
  57. socket_test.cpp
  58. sockets.cpp
  59. sockets.dia
  60. SYNC.TXT
  61. sysdeps.h
  62. sysdeps_test.cpp
  63. sysdeps_unix.cpp
  64. sysdeps_win32.cpp
  65. sysdeps_win32_test.cpp
  66. test_adb.py
  67. test_device.py
  68. trace.sh
  69. transport.cpp
  70. transport.h
  71. transport_benchmark.cpp
  72. transport_fd.cpp
  73. transport_local.cpp
  74. transport_test.cpp
  75. transport_usb.cpp
  76. types.cpp
  77. types.h
  78. types_test.cpp
  79. usb.h