| commit | bc28bedaf886e7dc05c7477e78a350f914115074 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Jun 05 18:53:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 18:53:13 2014 +0000 |
| tree | b8622eaa6d0b5dee73386ff87c21d8ed6bada913 | |
| parent | 33154817e274a4c7c381e2f5ef73ead7093e3985 [diff] | |
| parent | e0115dd1302f6156879938dfb8bcc9ac5a43d7a6 [diff] |
am e0115dd1: Merge "Build host with multilib both enabled." * commit 'e0115dd1302f6156879938dfb8bcc9ac5a43d7a6': Build host with multilib both enabled.
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_CFLAGS := -Werror +LOCAL_MULTILIB := both + include $(BUILD_HOST_STATIC_LIBRARY) # build device static library