commit bbdbc41caf9b477f5b7d30accf03f3cded28cf92
author Narayan Kamath <narayan@google.com> Thu Oct 02 14:45:40 2014 +0100
committer Narayan Kamath <narayan@google.com> Thu Oct 02 14:45:40 2014 +0100
tree 1891f44e093d935f43e7a1fa01ae27b7920e6566
parent 76a0c6e4ab835d8a9a7a0f5333f175f4d2cd772b

Build libcore CTS tests as multilib modules.

The CTS runner uses the same APK for both 32 and 64 bit
tests.

bug: 17745770
Change-Id: I4fd5bb061ab937e3bdd39b284844b6584f799437

tests/core/ctscore.mk

diff --git a/tests/core/ctscore.mk b/tests/core/ctscore.mk
index 95f4634..fea0b07 100644
--- a/tests/core/ctscore.mk
+++ b/tests/core/ctscore.mk
@@ -25,4 +25,8 @@
 
 LOCAL_JNI_SHARED_LIBRARIES := libjavacoretests
 
+# Include both the 32 and 64 bit versions of libjavacoretests,
+# where applicable.
+LOCAL_MULTILIB := both
+
 include $(BUILD_PACKAGE)