Add multilib support to dEQP.
Make drawElements Quality Program tests build both target
architechtures.
Bug: 17388917
Change-Id: I92b4dc153598801c62ce2062b6156fc47ec9c851
diff --git a/Android.mk b/Android.mk
index da2aeb0..850eb2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -537,6 +537,7 @@
LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_RTTI_FLAG := -frtti -fexceptions
+LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
diff --git a/android/package/Android.mk b/android/package/Android.mk
index 4b24494..54264c1 100644
--- a/android/package/Android.mk
+++ b/android/package/Android.mk
@@ -8,5 +8,6 @@
LOCAL_ASSET_DIR := $(LOCAL_PATH)/../../data
LOCAL_PACKAGE_NAME := com.drawelements.deqp
+LOCAL_MULTILIB := both
include $(BUILD_PACKAGE)