diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-25 03:54:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 03:54:40 +0000 |
| commit | 33a7e04397a935a34524517a07ca027ddebdc495 (patch) | |
| tree | e1e0b888255f794653455cb80ee92543b2dca5ed /NativeCode.mk | |
| parent | fdf7f349f5744b442e7c45d54c45342d0301c961 (diff) | |
| parent | 60e4a65d7c30ea0b5456933db9a1aa75e4a3f645 (diff) | |
| download | libcore-33a7e04397a935a34524517a07ca027ddebdc495.zip libcore-33a7e04397a935a34524517a07ca027ddebdc495.tar.gz libcore-33a7e04397a935a34524517a07ca027ddebdc495.tar.bz2 | |
am 60e4a65d: am 916c54b2: Merge "Enable host multilib for ART testing."
* commit '60e4a65d7c30ea0b5456933db9a1aa75e4a3f645':
Enable host multilib for ART testing.
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 675e8cc..0ae615e 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -127,6 +127,7 @@ LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils +LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) |