Merge "Fix the aprotoc target for Windows."

11 years ago · a174231837
parent 23c5978a76 b596f9c7b4
commit a174231837
1 changed files with 4 additions and 0 deletions
--- 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)