| commit | c34f37c7b5d26e58a9666fc277379111a7c2ea4f | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jun 11 01:03:22 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 10 22:15:14 2014 +0000 |
| tree | df378cd0ed8a95c403542454602634c5814d16ed | |
| parent | cec9dc14185dd1df6704a4af226ffbb2a1b9cd87 [diff] | |
| parent | ad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f [diff] |
Merge "Allow to opt out both multilib in native test."
diff --git a/core/native_test.mk b/core/native_test.mk index bc7f2e7..93b7e1a 100644 --- a/core/native_test.mk +++ b/core/native_test.mk
@@ -5,6 +5,10 @@ include $(BUILD_SYSTEM)/target_test_internal.mk +ifndef LOCAL_MULTILIB +ifndef LOCAL_32_BIT_ONLY LOCAL_MULTILIB := both +endif +endif include $(BUILD_EXECUTABLE)