am 4d11e705: Merge "Fix the aprotoc target for Windows."

* commit '4d11e705cb073e55283452e6fd50e3feff54f82c': Fix the aprotoc target for Windows.

am 4d11e705: Merge "Fix the aprotoc target for Windows."
* commit '4d11e705cb073e55283452e6fd50e3feff54f82c': Fix the aprotoc target for Windows.
985cc6a7 · Leandro Gracia Gil · Android Git Automerger · c390fe3e · a1742318 · 985cc6a7
Commit 985cc6a7 authored Jul 31, 2014 by Leandro Gracia Gil Committed by Android Git Automerger Jul 31, 2014
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Android.mk Android.mk +4 -0

No files found.
--- 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)