summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeandro Gracia Gil <leandrogracia@google.com>2015-03-20 23:14:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:14:05 +0000
commitf8172ce9bdb1b0898d79bf058e56bed44d85b019 (patch)
tree3a72d4a50ad087fb0d3c0b1e207c72de7ad54a6a
parentf210028d834fa773c0fb590bc992ed49de192f23 (diff)
parent3c1dbbae095cd8f4c354cf24e27c615c8e160bdc (diff)
downloadexternal_protobuf-f8172ce9bdb1b0898d79bf058e56bed44d85b019.zip
external_protobuf-f8172ce9bdb1b0898d79bf058e56bed44d85b019.tar.gz
external_protobuf-f8172ce9bdb1b0898d79bf058e56bed44d85b019.tar.bz2
am 3c1dbbae: am 4d11e705: Merge "Fix the aprotoc target for Windows."
* commit '3c1dbbae095cd8f4c354cf24e27c615c8e160bdc': Fix the aprotoc target for Windows.
-rw-r--r--Android.mk3
-rw-r--r--src/google/protobuf/compiler/subprocess.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index cc76926..f042d82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -351,7 +351,10 @@ LOCAL_C_INCLUDES := \
$(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: