diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-02 22:49:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-02 22:49:11 +0000 |
| commit | 5b14216647db393b0ae532c35a307b0cc8fed597 (patch) | |
| tree | 0442af5e0cd3f73b8639ab58ff7deeb2f5d00feb | |
| parent | 978f5dcdba6b6d1bb54011561faed6d3a7bd21a6 (diff) | |
| parent | adde3496cdb03cac85ea9c724a694bbe3d62c114 (diff) | |
| download | protobuf-5b14216647db393b0ae532c35a307b0cc8fed597.tar.gz | |
Merge "Stop checking HOST_OS, whitelist windows module"
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk index d4306e03d..0c3b03596 100644 --- a/Android.mk +++ b/Android.mk @@ -431,28 +431,23 @@ protobuf_cc_full_src_files := include $(CLEAR_VARS) LOCAL_MODULE := aprotoc -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows # Statically link libc++ because we copy aprotoc to unbundled projects where -# libc++.so may not be available. Just use mingw's libstdc++ for Windows. -ifneq ($(HOST_OS),windows) - LOCAL_CXX_STL := libc++_static -endif +# libc++.so may not be available. +LOCAL_CXX_STL := libc++_static LOCAL_CPP_EXTENSION := .cc 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_LDLIBS_darwin := -lpthread +LOCAL_LDLIBS_linux := -lpthread LOCAL_CFLAGS := $(IGNORED_WARNINGS) |