Merge "Fix the aprotoc target for Windows."

a1742318 · Leandro Gracia Gil · Gerrit Code Review · 23c5978a · b596f9c7 · a1742318
Commit a1742318 authored Jul 31, 2014 by Leandro Gracia Gil Committed by Gerrit Code Review Jul 29, 2014
Hide 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)