Skip to content

Remove armeabi from build. #1995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Jul 26, 2018
Merged

Remove armeabi from build. #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build-tools/scripts/BuildEverything.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 5efe5c to 36fec3
1 change: 0 additions & 1 deletion src/Mono.Android/Test/Mono.Android-Tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<AndroidNativeLibrary Include="libs\arm64-v8a\libreuse-threads.so" />
<AndroidNativeLibrary Include="libs\armeabi\libreuse-threads.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libreuse-threads.so" />
<AndroidNativeLibrary Include="libs\x86\libreuse-threads.so" />
<AndroidNativeLibrary Include="libs\x86_64\libreuse-threads.so" />
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Android/Test/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.

<_PackagedResources>$(IntermediateOutputPath)android\bin\packaged_resources</_PackagedResources>

<_Android32bitArchitectures>armeabi-v7a;armeabi;x86;mips</_Android32bitArchitectures>
<_Android32bitArchitectures>armeabi-v7a;x86;mips</_Android32bitArchitectures>
<_Android64bitArchitectures>arm64-v8a;x86_64;mips64</_Android64bitArchitectures>

<_AndroidSequencePointsMode Condition=" '$(MonoSymbolArchive)' == 'True' And '$(AndroidUseDebugRuntime)' == 'False' And '$(AotAssemblies)' == 'True' And '$(DebugSymbols)' == 'True' And ('$(DebugType)' == 'PdbOnly' Or '$(DebugType)' == 'Portable')">Offline</_AndroidSequencePointsMode>
Expand Down
2 changes: 1 addition & 1 deletion src/sqlite-xamarin/src/main/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
1 change: 0 additions & 1 deletion tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
</PropertyGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\arm64-v8a\libtiming.so" />
<AndroidNativeLibrary Include="libs\armeabi\libtiming.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libtiming.so" />
<AndroidNativeLibrary Include="libs\x86\libtiming.so" />
<AndroidNativeLibrary Include="libs\x86_64\libtiming.so" />
Expand Down
2 changes: 1 addition & 1 deletion tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions ...s/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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")]
Expand Down
1 change: 0 additions & 1 deletion ....Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
</PropertyGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\arm64-v8a\libsimple.so" />
<AndroidNativeLibrary Include="libs\armeabi\libsimple.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libsimple.so" />
<AndroidNativeLibrary Include="libs\x86\libsimple.so" />
<AndroidNativeLibrary Include="libs\x86_64\libsimple.so" />
Expand Down
4 changes: 2 additions & 2 deletions ...Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Exec Command="&quot;$(NdkBuildPath)&quot;" />
<MakeDir Directories="$(OutputPath)\native-lib-1" />
<Exec
Command="&quot;$(JarPath)&quot; cf ../$(OutputPath)/native-lib-1/NativeLib.zip arm64-v8a armeabi armeabi-v7a x86 x86_64"
Command="&quot;$(JarPath)&quot; cf ../$(OutputPath)/native-lib-1/NativeLib.zip arm64-v8a armeabi-v7a x86 x86_64"
WorkingDirectory="libs"
/>
</Target>
Expand All @@ -30,7 +30,7 @@
<MakeDir Directories="$(OutputPath)\native-lib-2" />
<MakeDir Directories="$(OutputPath)\native-lib-2\aar-test" />
<Exec
Command="&quot;$(JarPath)&quot; cf ../../$(OutputPath)/native-lib-2/aar-test/EmbeddedNativeLib.zip arm64-v8a armeabi armeabi-v7a x86 x86_64"
Command="&quot;$(JarPath)&quot; cf ../../$(OutputPath)/native-lib-2/aar-test/EmbeddedNativeLib.zip arm64-v8a armeabi-v7a x86 x86_64"
WorkingDirectory="simple2/libs"
/>
<Exec
Expand Down
2 changes: 1 addition & 1 deletion tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ...s/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/simple2/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ...CodeGen-MkBundle/Xamarin.Android.MakeBundle-Tests/Xamarin.Android.MakeBundle-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<ItemGroup>
<AndroidNativeLibrary Include="libs\x86\libsanangeles.so" />
<Compile Include="MainActivity.cs" />
<AndroidNativeLibrary Include="libs\armeabi\libsanangeles.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libsanangeles.so" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion .../Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
</CleanDependsOn>
</PropertyGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="libs\armeabi\libtiming2.so" />
<EmbeddedNativeLibrary Include="libs\armeabi-v7a\libtiming2.so" />
<EmbeddedNativeLibrary Include="libs\x86\libtiming2.so" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .../Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
</CleanDependsOn>
</PropertyGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="libs\armeabi\libtiming4.so" />
<EmbeddedNativeLibrary Include="libs\armeabi-v7a\libtiming4.so" />
<EmbeddedNativeLibrary Include="libs\x86\libtiming4.so" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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