From 7de597cca2b34f70b1e7dcaad3a8142267d66cc5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= <misojarvi@google.com>
Date: Wed, 17 Sep 2014 11:37:36 +0300
Subject: [PATCH] Add multilib support to dEQP.

Make drawElements Quality Program tests build both target
architechtures.

Bug: 17388917
Change-Id: I92b4dc153598801c62ce2062b6156fc47ec9c851
---
 Android.mk                 | 1 +
 android/package/Android.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index da2aeb0e2..850eb2c3a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -537,6 +537,7 @@ LOCAL_SDK_VERSION := 9
 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 4b244946e..54264c186 100644
--- a/android/package/Android.mk
+++ b/android/package/Android.mk
@@ -8,5 +8,6 @@ LOCAL_JNI_SHARED_LIBRARIES := libtestercore
 
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/../../data
 LOCAL_PACKAGE_NAME := com.drawelements.deqp
+LOCAL_MULTILIB := both
 
 include $(BUILD_PACKAGE)
-- 
2.34.1