Commit fd76c34a authored Jun 11, 2014 by Ying Wang Committed by Android Git Automerger Jun 11, 2014

am c34f37c7: Merge "Allow to opt out both multilib in native test."

* commit 'c34f37c7':
  Allow to opt out both multilib in native test.

core/native_test.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)