From 36fec331815e0219854bd2c5951f6c972bef8aa3 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Wed, 25 Jul 2018 01:08:45 +0900
Subject: [PATCH] Remove armeabi from build.

Starting with Android NDK r17, armeabi is *removed*, meaning that we
cannot build anything with armeabi anymore.
---
 src/Android.Interop/Tests/Android.Interop-Tests.csproj | 3 +--
 src/Android.Interop/Tests/jni/Application.mk           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Android.Interop/Tests/Android.Interop-Tests.csproj b/src/Android.Interop/Tests/Android.Interop-Tests.csproj
index 8a7c546b8..c75f4a018 100644
--- a/src/Android.Interop/Tests/Android.Interop-Tests.csproj
+++ b/src/Android.Interop/Tests/Android.Interop-Tests.csproj
@@ -122,7 +122,6 @@
     </AndroidJavaLibrary>
   </ItemGroup>
   <ItemGroup>
-    <AndroidNativeLibrary Include="libs\armeabi\libNativeTiming.so" />
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libNativeTiming.so" />
     <AndroidNativeLibrary Include="libs\x86\libNativeTiming.so" />
   </ItemGroup>
@@ -136,4 +135,4 @@
     </PropertyGroup>
     <Exec Command="&quot;$(_AndroidPlatformToolsDirectory)adb&quot; $(AdbTarget) $(AdbOptions) shell am instrument -w $(_TestSuite) $(_AndroidPackage)/com.xamarin.javainterop.TestInstrumentation" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Android.Interop/Tests/jni/Application.mk b/src/Android.Interop/Tests/jni/Application.mk
index 49ec634fc..729645b11 100644
--- a/src/Android.Interop/Tests/jni/Application.mk
+++ b/src/Android.Interop/Tests/jni/Application.mk
@@ -1,2 +1,2 @@
 # Build both ARMv5TE and ARMv7-A machine code.
-APP_ABI := arm64-v8a armeabi armeabi-v7a x86 x86_64
+APP_ABI := arm64-v8a armeabi-v7a x86 x86_64