diff options
| author | Leandro Gracia Gil <leandrogracia@google.com> | 2014-07-28 15:27:19 -0700 |
|---|---|---|
| committer | Leandro Gracia Gil <leandrogracia@google.com> | 2014-07-28 15:27:21 -0700 |
| commit | b596f9c7b4380b89391437818ebbcfa2c7aff6a0 (patch) | |
| tree | b42742170a63a446227dac537a55809e376a9fa3 /Android.mk | |
| parent | 23c5978a76f69fbe5cc5ccc282c894b45669ae71 (diff) | |
| download | protobuf-b596f9c7b4380b89391437818ebbcfa2c7aff6a0.tar.gz protobuf-b596f9c7b4380b89391437818ebbcfa2c7aff6a0.tar.bz2 protobuf-b596f9c7b4380b89391437818ebbcfa2c7aff6a0.zip | |
Fix the aprotoc target for Windows.
Allows aprotoc.exe to be cross-compiled when building the Windows SDK.
Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 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) |