diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-24 21:26:58 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-02-25 15:07:57 -0800 |
| commit | cc731cc76786b6bdc58764aad9924c0d0c8d645f (patch) | |
| tree | 57906636c803e1ae089c2fcf2905d82488b0ba72 /adb/Android.mk | |
| parent | a035d5003ea593322ba565df9a4f4d0dd6647acf (diff) | |
| download | system_core-cc731cc76786b6bdc58764aad9924c0d0c8d645f.tar.gz system_core-cc731cc76786b6bdc58764aad9924c0d0c8d645f.tar.bz2 system_core-cc731cc76786b6bdc58764aad9924c0d0c8d645f.zip | |
Test readx/writex (now renamed).
Renamed readx/writex to ReadFdExactly/WriteFdExactly respectively.
These read/write a full fixed-size buffer. If the whole buffer cannot
be read/written, these functions return an error.
Rename write_string to WriteStringFully.
Move the TEMP_FAILURE_RETRY definition in sysdeps.h out of the
!Windows section. It seems Windows won't actually interrupt a call,
but it's easier to just define it than to #ifdef each call.
Change-Id: Ia8ddffa2a52764a2f9a281c96c937660e002b9b9
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 86d178a2b..adad69f5b 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -19,6 +19,7 @@ ADB_CLANG := LIBADB_SRC_FILES := \ adb.c \ adb_auth.c \ + adb_io.cpp \ adb_listeners.c \ sockets.c \ transport.c \ @@ -69,6 +70,7 @@ endif include $(BUILD_HOST_STATIC_LIBRARY) LIBADB_TEST_SRCS := \ + adb_io_test.cpp \ transport_test.cpp \ include $(CLEAR_VARS) @@ -77,7 +79,7 @@ LOCAL_MODULE := adbd_test LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) LOCAL_STATIC_LIBRARIES := libadbd -LOCAL_SHARED_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := liblog libcutils libutils include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) @@ -85,10 +87,12 @@ LOCAL_CLANG := $(ADB_CLANG) LOCAL_MODULE := adb_test LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS) LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) services.c +LOCAL_SHARED_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := \ libadb \ libcrypto_static \ libcutils \ + libutils \ ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt -ldl -lpthread |