1 files changed, 31 insertions, 12 deletions
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index 4bf841d1fb66..7f0780076180 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -13,23 +13,33 @@ SRCS+= adb_auth_host.cpp
 SRCS+= adb_client.cpp
 SRCS+= adb_io.cpp
 SRCS+= adb_listeners.cpp
-SRCS+= adb_main.cpp
+SRCS+= adb_trace.cpp
 SRCS+= adb_utils.cpp
 SRCS+= commandline.cpp
 SRCS+= console.cpp
+SRCS+= diagnose_usb.cpp
 SRCS+= fdevent.cpp
 SRCS+= file_sync_client.cpp
+SRCS+= line_printer.cpp
 SRCS+= services.cpp
-# XXX SuffFindDeps may fail to restore suffix lost in transformation
+SRCS+= shell_service_protocol.cpp
 SRCS+= ../adb/sockets.cpp
+SRCS+= sysdeps_unix.cpp
 SRCS+= transport.cpp
 SRCS+= transport_local.cpp
 SRCS+= transport_usb.cpp
 
 TEST_SRCS+= adb_io_test.cpp
 TEST_SRCS+= adb_utils_test.cpp
+TEST_SRCS+= fdevent_test.cpp
+TEST_SRCS+= shell_service_protocol_test.cpp
+TEST_SRCS+= socket_test.cpp
+TEST_SRCS+= sysdeps_test.cpp
 TEST_SRCS+= transport_test.cpp
 
+.PATH: ${.CURDIR}/client
+SRCS+= main.cpp
+
 .PATH: ${EXTRADIR}
 SRCS+= get_my_path_freebsd.cpp
 SRCS+= usb_libusb.cpp
@@ -37,30 +47,39 @@ SRCS+= usb_libusb.cpp
 .PATH: ${.CURDIR}/../base
 SRCS+= file.cpp
 SRCS+= logging.cpp
-SRCS+= strings.cpp
+SRCS+= parsenetaddress.cpp
 SRCS+= stringprintf.cpp
+SRCS+= strings.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
+TEST_SRCS+= parsenetaddress_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
 
 .PATH: ${.CURDIR}/../libcutils
-SRCS+= socket_inaddr_any_server.c
-SRCS+= socket_local_client.c
-SRCS+= socket_local_server.c
-SRCS+= socket_loopback_client.c
-SRCS+= socket_loopback_server.c
-SRCS+= socket_network_client.c
+SRCS+= socket_inaddr_any_server_unix.c
+SRCS+= socket_local_client_unix.c
+SRCS+= socket_local_server_unix.c
+SRCS+= socket_loopback_client_unix.c
+SRCS+= socket_loopback_server_unix.c
+SRCS+= socket_network_client_unix.c
+SRCS+= ../libcutils/sockets.cpp
 SRCS+= load_file.c
 SRCS+= threads.c
+# XXX Obsolete after 10.2 or r279980/r280329
+CPPFLAGS.sockets.cpp+= -o ${.TARGET}
 
 # required by base/file.cpp
 .PATH: ${.CURDIR}/../liblog
+SRCS+= config_write.c
 SRCS+= fake_log_device.c
-SRCS+= logd_write.c
-CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
+SRCS+= fake_writer.c
+SRCS+= logger_lock.c
+SRCS+= logger_name.c
+SRCS+= logger_write.c
+CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1
 
 REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
@@ -110,5 +129,5 @@ beforeinstall:
 test: ${PROG}_test
 	@for f in ${.ALLSRC}; do ./$$f; done
 
-${PROG}_test: ${OBJS:Nadb_main.o:Ncommandline.o} ${TEST_OBJS}
+${PROG}_test: ${OBJS:Nmain.o:Ncommandline.o} ${TEST_OBJS}
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}