From b596f9c7b4380b89391437818ebbcfa2c7aff6a0 Mon Sep 17 00:00:00 2001 From: Leandro Gracia Gil Date: Mon, 28 Jul 2014 15:27:19 -0700 Subject: [PATCH] Fix the aprotoc target for Windows. Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c --- Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.mk b/Android.mk index 3f9b2e14d..f042d82f4 100644 --- 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)