From 94995b1dc8d4f66bc13a45961a79c17f646acf55 Mon Sep 17 00:00:00 2001
From: Unsuk Jung <unsuk@google.com>
Date: Thu, 9 Oct 2014 00:59:51 -0700
Subject: [PATCH] Build CTS tests as multilib apks

CTS-tradefed uses the same apk for both 32 and 64 bit tests.

Bug: 17924614
Change-Id: Idbf2d93c54efbb1c281ad9e93f0f39430614df61
---
 tests/cts/net/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index da19a4da78..46d4d819ac 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -21,6 +21,9 @@ LOCAL_MODULE_TAGS := optional
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
+# Include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
 LOCAL_JAVA_LIBRARIES := voip-common conscrypt
 
 LOCAL_JNI_SHARED_LIBRARIES := libnativedns_jni