From ad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 10 Jun 2014 17:52:20 -0700
Subject: [PATCH] Allow to opt out both multilib in native test.

This fixes error no 64-bit libdvm for dalvik-vm-unit-tests.

Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
---
 core/native_test.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/native_test.mk b/core/native_test.mk
index bc7f2e7aa..93b7e1a90 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)