commit 19f3f05fc283efee8176845ab32b6a7bec7ae4fb
author David Pursell <dpursell@google.com> Sat Sep 12 01:44:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 12 01:44:40 2015 +0000
tree 423e3deba9baca943b91a1a2f99ef8b9847e7ea8
parent 72d012df266edec0cbcb4e289e665a962c70559b
parent 7a911642324a7424f203b34352b6705adc13ff1d

am 3b43b161: am 7b749acd: Merge "adb: fix shell_service_protocol_test for Windows."

* commit '3b43b161824946cca173d66694c8941f94a7aca2':
  adb: fix shell_service_protocol_test for Windows.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 385b1c5..67c3eb7 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -133,8 +133,6 @@
     $(LIBADB_TEST_SRCS) \
     $(LIBADB_TEST_linux_SRCS) \
     shell_service_protocol.cpp \
-
-LOCAL_SRC_FILES_linux := \
     shell_service_protocol_test.cpp \
 
 LOCAL_SANITIZE := $(adb_target_sanitize)
@@ -155,11 +153,9 @@
     $(LIBADB_TEST_SRCS) \
     services.cpp \
     shell_service_protocol.cpp \
-
-LOCAL_SRC_FILES_linux := \
-    $(LIBADB_TEST_linux_SRCS) \
     shell_service_protocol_test.cpp \
 
+LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)
 LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)
 LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)
 LOCAL_SANITIZE := $(adb_host_sanitize)

adb/shell_service_protocol_test.cpp

diff --git a/adb/shell_service_protocol_test.cpp b/adb/shell_service_protocol_test.cpp
index 85b2f91..a826035 100644
--- a/adb/shell_service_protocol_test.cpp
+++ b/adb/shell_service_protocol_test.cpp
@@ -72,13 +72,17 @@
         read_protocol_->buffer_end_ = read_protocol_->data() + size;
     }
 
+#if !defined(_WIN32)
     static sig_t saved_sigpipe_handler_;
+#endif
 
     int read_fd_ = -1, write_fd_ = -1;
     ShellProtocol *read_protocol_ = nullptr, *write_protocol_ = nullptr;
 };
 
+#if !defined(_WIN32)
 sig_t ShellProtocolTest::saved_sigpipe_handler_ = nullptr;
+#endif
 
 namespace {
 

adb/sysdeps_win32.cpp

diff --git a/adb/sysdeps_win32.cpp b/adb/sysdeps_win32.cpp
index c5aad02..5b23c79 100644
--- a/adb/sysdeps_win32.cpp
+++ b/adb/sysdeps_win32.cpp
@@ -1121,6 +1121,11 @@
     BIPD(( "bip_buffer_write: enter %d->%d len %d", bip->fdin, bip->fdout, len ));
     BIPDUMP( src, len );
 
+    if (bip->closed) {
+        errno = EPIPE;
+        return -1;
+    }
+
     EnterCriticalSection( &bip->lock );
 
     while (!bip->can_write) {