commit 447139ee2fc2dc93d6d845c436e8643b9f63a6d5
author Unsuk Jung <unsuk@google.com> Fri Oct 10 16:58:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 10 16:58:34 2014 +0000
tree e11c10edf659e324572d3d9f9485160e841bcd5d
parent 6aa130c992626a547b9217d790ce1af38c492af1
parent 94995b1dc8d4f66bc13a45961a79c17f646acf55

am 3841975e: am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev

* commit '3841975e258b5eabd8fbdb5e0ecda5648f392d7f':
  Build CTS tests as multilib apks

tests/cts/net/Android.mk

diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index da19a4d..46d4d81 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -21,6 +21,9 @@
 # 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