| commit | b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@android.com> | Wed Jun 11 01:12:28 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 10 22:08:45 2014 +0000 |
| tree | 54e2b57eaa957eb257cdabf2c9ff71c30a513592 | |
| parent | c34f37c7b5d26e58a9666fc277379111a7c2ea4f [diff] | |
| parent | 532f1127af494ea9ec59e588d080846ed7b99e75 [diff] |
Merge "Revert "Don't rename host libraries if only one arch is build.""
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)