diff options
| author | Leandro Gracia Gil <leandrogracia@google.com> | 2014-07-31 18:26:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-31 18:26:01 +0000 |
| commit | 3c1dbbae095cd8f4c354cf24e27c615c8e160bdc (patch) | |
| tree | 3a72d4a50ad087fb0d3c0b1e207c72de7ad54a6a | |
| parent | f9b409e35963a357985ee687d096f8c166e0b80e (diff) | |
| parent | 4d11e705cb073e55283452e6fd50e3feff54f82c (diff) | |
| download | external_protobuf-3c1dbbae095cd8f4c354cf24e27c615c8e160bdc.zip external_protobuf-3c1dbbae095cd8f4c354cf24e27c615c8e160bdc.tar.gz external_protobuf-3c1dbbae095cd8f4c354cf24e27c615c8e160bdc.tar.bz2 | |
am 4d11e705: Merge "Fix the aprotoc target for Windows."
* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
Fix the aprotoc target for Windows.
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/subprocess.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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: |