commit 615d78399d3c2936db113a61a3f9804fdd3f597b
author Unsuk Jung <unsuk@google.com> Thu Oct 09 12:51:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 12:51:27 2014 +0000
tree e11c10edf659e324572d3d9f9485160e841bcd5d
parent 581a02c865105863671503e6b245945857c716ea
parent 94995b1dc8d4f66bc13a45961a79c17f646acf55

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

* commit '831e438ba317402e19415f157cbe7d9c93c4f9ad':
  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