From bcbea78e367523e5cbb257c25c03a31b1250c7ba Mon Sep 17 00:00:00 2001
From: Leandro Gracia Gil <leandrogracia@google.com>
Date: Mon, 28 Jul 2014 15:27:19 -0700
Subject: Fix the aprotoc target for Windows.

Allows aprotoc.exe to be cross-compiled when building the Windows SDK.

Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
---
 Android.mk                                | 4 ++++
 src/google/protobuf/compiler/subprocess.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 3f9b2e1..f042d82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -347,10 +347,14 @@ LOCAL_SRC_FILES := $(COMPILER_SRC_FILES)
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/android \
+    external/zlib \
     $(LOCAL_PATH)/src
 
 LOCAL_STATIC_LIBRARIES += libz
+
+ifneq ($(HOST_OS),windows)
 LOCAL_LDLIBS := -lpthread
+endif
 
 LOCAL_CFLAGS := $(IGNORED_WARNINGS)
 
diff --git a/src/google/protobuf/compiler/subprocess.h b/src/google/protobuf/compiler/subprocess.h
index f9e8ae8..7a6fa70 100644
--- a/src/google/protobuf/compiler/subprocess.h
+++ b/src/google/protobuf/compiler/subprocess.h
@@ -76,7 +76,7 @@ class Subprocess {
 #ifdef _WIN32
   // Given an error code, returns a human-readable error message.  This is
   // defined here so that CommandLineInterface can share it.
-  static string Subprocess::Win32ErrorMessage(DWORD error_code);
+  static string Win32ErrorMessage(DWORD error_code);
 #endif
 
  private:
-- 
cgit v1.1