Build CTS tests as multilib apks
CTS-tradefed uses the same apk for both 32 and 64 bit tests.
Bug: 17924614
Change-Id: Idbf2d93c54efbb1c281ad9e93f0f39430614df61
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index 936a35e..15237a8 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/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_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestserver ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni