diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 18:40:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-05 18:40:27 +0000 |
| commit | 8d977782c1cfe9d75cc9a464439c2ff1e27e1665 (patch) | |
| tree | 9db862fd1968a63447cdb18d984ed8dda762e4ab | |
| parent | a5c7131da47c991585a6c6ac0c063b6d7d56e3fc (diff) | |
| parent | f3a7284e3890ddabe3116d4b6c81028fb7b524d2 (diff) | |
| download | android_external_zlib-8d977782c1cfe9d75cc9a464439c2ff1e27e1665.tar.gz android_external_zlib-8d977782c1cfe9d75cc9a464439c2ff1e27e1665.tar.bz2 android_external_zlib-8d977782c1cfe9d75cc9a464439c2ff1e27e1665.zip | |
Merge "Build host with multilib both enabled."staging/cm-12.0-caf
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -50,6 +50,7 @@ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -60,6 +61,7 @@ LOCAL_MODULE := libz-host LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) @@ -75,6 +77,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(zlib_files) LOCAL_MODULE:= libunz LOCAL_ARM_MODE := arm +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) |