diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-17 18:58:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 18:58:34 +0000 |
| commit | 9db200f7ade51a7c6fcfaf0eac9db4351f354c50 (patch) | |
| tree | d60dfb0f2ee47acc264e94d2ad7e7c9c41282469 | |
| parent | 3a53b49075d53434212875c139d6c1ca074429d8 (diff) | |
| parent | 4436749284dc2b74e6e0f430d0f803d1b7862d19 (diff) | |
| download | core-9db200f7ade51a7c6fcfaf0eac9db4351f354c50.tar.gz core-9db200f7ade51a7c6fcfaf0eac9db4351f354c50.tar.bz2 core-9db200f7ade51a7c6fcfaf0eac9db4351f354c50.zip | |
am 44367492: am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4436749284dc2b74e6e0f430d0f803d1b7862d19':
Enable host multilib for ART testing.
| -rw-r--r-- | libbacktrace/Android.build.mk | 1 | ||||
| -rwxr-xr-x | libbacktrace/Android.mk | 2 | ||||
| -rw-r--r-- | libziparchive/Android.mk | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index 9882e3116..2f5564533 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -18,6 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) +LOCAL_MULTILIB := $($(module)_multilib) LOCAL_ADDITIONAL_DEPENDENCIES := \ $(LOCAL_PATH)/Android.mk \ diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 74bae1ae7..1de81e7df 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -113,7 +113,9 @@ build_type := target build_target := SHARED_LIBRARY include $(LOCAL_PATH)/Android.build.mk build_type := host +libbacktrace_libc++_multilib := both include $(LOCAL_PATH)/Android.build.mk +libbacktrace_libc++_multilib := endif #------------------------------------------------------------------------- diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 1d48fea82..705caa5a1 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -42,6 +42,7 @@ LOCAL_C_INCLUDES += ${includes} LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_MODULE:= libziparchive-host LOCAL_CFLAGS := -Werror +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) |