From a4b97b545aa0812de826eb0e05473e3bad8e899a Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Wed, 25 Jul 2018 01:11:32 +0900 Subject: [PATCH] Remove armeabi from build. Starting with Android NDK r17, armeabi is *removed*, meaning that we cannot build anything with armeabi anymore. seealso: https://github.com/xamarin/java.interop/pull/346 --- build-tools/scripts/BuildEverything.mk | 1 - external/Java.Interop | 2 +- src/Mono.Android/Test/Mono.Android-Tests.targets | 1 - src/Mono.Android/Test/jni/Application.mk | 2 +- .../Xamarin.Android.Common.targets | 2 +- src/sqlite-xamarin/src/main/jni/Application.mk | 2 +- .../Xamarin.Android.JcwGen-Tests.csproj | 1 - .../Xamarin.Android.JcwGen-Tests/jni/Application.mk | 2 +- .../Properties/AssemblyInfo.cs | 5 ----- .../Xamarin.Android.LibraryProjectZip-LibBinding.csproj | 1 - .../Xamarin.Android.LibraryProjectZip-LibBinding.targets | 4 ++-- .../jni/Application.mk | 2 +- .../simple2/jni/Application.mk | 2 +- .../Xamarin.Android.MakeBundle-Tests.csproj | 1 - .../Xamarin.Android.BindingResolveImportLib2.csproj | 1 - .../jni/Application.mk | 2 +- .../Xamarin.Android.BindingResolveImportLib4.csproj | 1 - .../jni/Application.mk | 2 +- 18 files changed, 11 insertions(+), 23 deletions(-) diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index 14a0a05344d..90180ccbb44 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -39,7 +39,6 @@ STABLE_FRAMEWORKS = $(foreach a, $(STABLE_API_LEVELS), $(word $(a),$(ALL_FRAMEWO PLATFORM_IDS = $(foreach a, $(API_LEVELS), $(word $(a),$(ALL_PLATFORM_IDS))) ALL_JIT_ABIS = \ - armeabi \ armeabi-v7a \ arm64-v8a \ x86 \ diff --git a/external/Java.Interop b/external/Java.Interop index 5efe5c29a0f..36fec331815 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 5efe5c29a0f0e1b7e80bc0b51d847c339d438f9a +Subproject commit 36fec331815e0219854bd2c5951f6c972bef8aa3 diff --git a/src/Mono.Android/Test/Mono.Android-Tests.targets b/src/Mono.Android/Test/Mono.Android-Tests.targets index b33a84782d6..3deadce4d45 100644 --- a/src/Mono.Android/Test/Mono.Android-Tests.targets +++ b/src/Mono.Android/Test/Mono.Android-Tests.targets @@ -2,7 +2,6 @@ - diff --git a/src/Mono.Android/Test/jni/Application.mk b/src/Mono.Android/Test/jni/Application.mk index 49ec634fc40..729645b114c 100644 --- a/src/Mono.Android/Test/jni/Application.mk +++ b/src/Mono.Android/Test/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 diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets index 9cbefc43d0f..f75a790e530 100755 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets @@ -298,7 +298,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved. <_PackagedResources>$(IntermediateOutputPath)android\bin\packaged_resources - <_Android32bitArchitectures>armeabi-v7a;armeabi;x86;mips + <_Android32bitArchitectures>armeabi-v7a;x86;mips <_Android64bitArchitectures>arm64-v8a;x86_64;mips64 <_AndroidSequencePointsMode Condition=" '$(MonoSymbolArchive)' == 'True' And '$(AndroidUseDebugRuntime)' == 'False' And '$(AotAssemblies)' == 'True' And '$(DebugSymbols)' == 'True' And ('$(DebugType)' == 'PdbOnly' Or '$(DebugType)' == 'Portable')">Offline diff --git a/src/sqlite-xamarin/src/main/jni/Application.mk b/src/sqlite-xamarin/src/main/jni/Application.mk index ceeb0b40ef5..5f9c9366a99 100644 --- a/src/sqlite-xamarin/src/main/jni/Application.mk +++ b/src/sqlite-xamarin/src/main/jni/Application.mk @@ -1 +1 @@ -APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64 +APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj index 83477f0c8b5..4d77f7fa18b 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj +++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj @@ -82,7 +82,6 @@ - diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/jni/Application.mk b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/jni/Application.mk index 49ec634fc40..729645b114c 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/jni/Application.mk +++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-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 diff --git a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs index 636880ce93f..9dd7ca0da3e 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs +++ b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs @@ -29,8 +29,6 @@ // native library path should contain abi [assembly: Android.NativeLibraryReference ("arm64-v8a/libsimple.so", SourceUrl="file:///NativeLib.zip", Version="native-lib-1")] -[assembly: Android.NativeLibraryReference ("armeabi/libsimple.so", - SourceUrl="file:///NativeLib.zip", Version="native-lib-1")] [assembly: Android.NativeLibraryReference ("armeabi-v7a/libsimple.so", SourceUrl="file:///NativeLib.zip", Version="native-lib-1")] [assembly: Android.NativeLibraryReference ("x86/libsimple.so", @@ -42,9 +40,6 @@ [assembly: Android.NativeLibraryReference ("arm64-v8a/libsimple2.so", EmbeddedArchive="aar-test/EmbeddedNativeLib.zip", SourceUrl="file:///NativeLib2.zip", Version="native-lib-2")] -[assembly: Android.NativeLibraryReference ("armeabi/libsimple2.so", - EmbeddedArchive="aar-test/EmbeddedNativeLib.zip", - SourceUrl="file:///NativeLib2.zip", Version="native-lib-2")] [assembly: Android.NativeLibraryReference ("armeabi-v7a/libsimple2.so", EmbeddedArchive="aar-test/EmbeddedNativeLib.zip", SourceUrl="file:///NativeLib2.zip", Version="native-lib-2")] diff --git a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj index 65c76924dcb..6be2cb68837 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj +++ b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj @@ -72,7 +72,6 @@ - diff --git a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets index a0b3af504f1..41684fc8429 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets +++ b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets @@ -11,7 +11,7 @@ @@ -30,7 +30,7 @@ - diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj index 59df526472e..8a3a9fb2d90 100644 --- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj +++ b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj @@ -80,7 +80,6 @@ - diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk index 49ec634fc40..729645b114c 100644 --- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk +++ b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/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 diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj index b88687d1fde..81344136971 100644 --- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj +++ b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj @@ -78,7 +78,6 @@ - diff --git a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk index 49ec634fc40..729645b114c 100644 --- a/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk +++ b/tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/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