summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeandro Gracia Gil <leandrogracia@google.com>2014-07-28 15:27:19 -0700
committerLeandro Gracia Gil <leandrogracia@google.com>2014-07-28 15:27:21 -0700
commitbcbea78e367523e5cbb257c25c03a31b1250c7ba (patch)
tree3a72d4a50ad087fb0d3c0b1e207c72de7ad54a6a
parent95d99df4574c28debcf9646056a0350ff44bc7c9 (diff)
downloadexternal_protobuf-bcbea78e367523e5cbb257c25c03a31b1250c7ba.zip
external_protobuf-bcbea78e367523e5cbb257c25c03a31b1250c7ba.tar.gz
external_protobuf-bcbea78e367523e5cbb257c25c03a31b1250c7ba.tar.bz2
Fix the aprotoc target for Windows.
Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
-rw-r--r--Android.mk4
-rw-r--r--src/google/protobuf/compiler/subprocess.h2
2 files changed, 5 insertions, 1 deletions
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: