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

* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
  Fix the aprotoc target for Windows.
This commit is contained in:
Leandro Gracia Gil 2014-07-31 18:26:01 +00:00 committed by Android Git Automerger
commit 985cc6a74e

View File

@ -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)