diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 20:07:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 20:07:37 +0000 |
| commit | d1b8fc4378451894a7f66a66a318f4f54c64f83a (patch) | |
| tree | 35b95df8b339433507016e9563b07152984e54d9 | |
| parent | b7c07da2f4606ca36b93c2b9221e43e6ebe68831 (diff) | |
| parent | bc28bedaf886e7dc05c7477e78a350f914115074 (diff) | |
| download | system_core-d1b8fc4378451894a7f66a66a318f4f54c64f83a.zip system_core-d1b8fc4378451894a7f66a66a318f4f54c64f83a.tar.gz system_core-d1b8fc4378451894a7f66a66a318f4f54c64f83a.tar.bz2 | |
am bc28beda: am e0115dd1: Merge "Build host with multilib both enabled."
* commit 'bc28bedaf886e7dc05c7477e78a350f914115074':
Build host with multilib both enabled.
| -rw-r--r-- | libzipfile/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libzipfile/Android.mk b/libzipfile/Android.mk index 614a460..12a2229 100644 --- a/libzipfile/Android.mk +++ b/libzipfile/Android.mk @@ -16,6 +16,8 @@ LOCAL_C_INCLUDES += external/zlib LOCAL_CFLAGS := -Werror +LOCAL_MULTILIB := both + include $(BUILD_HOST_STATIC_LIBRARY) # build device static library |