Permalink
Browse files

[build] Remove all traces of armeabi (ARMv5) (#2106)

Android NDK r17 has dropped support for `armeabi` and any attempt to
build projects targeting this ABI fails with an error.

In preparation for NDK r17 this commit removes all the traces of
`armeabi` from xamarin-android tree.

In order to prevent confusion, all the instances where we used
`armeabi` but meant `armeabi-v7a` have been renamed to the latter
form.
  • Loading branch information...
grendello authored and jonpryor committed Aug 29, 2018
1 parent d967436 commit 9abbfc44dc86450769a3c4ef8d415d442d5de37c
Showing with 41 additions and 111 deletions.
  1. +5 −8 Configuration.Override.props.in
  2. +1 −1 Configuration.props
  3. +1 −2 Documentation/building/configuration.md
  4. +0 −4 Documentation/building/unix-instructions.md
  5. +3 −5 Documentation/guides/BuildProcess.md
  6. +1 −1 Documentation/guides/messages/adb0020.md
  7. +1 −1 Documentation/guides/messages/xa4301.md
  8. +4 −9 build-tools/scripts/BuildEverything.mk
  9. +0 −1 src/Mono.Android/Test/Mono.Android-Tests.targets
  10. +1 −1 src/Mono.Android/Test/jni/Application.mk
  11. +0 −3 src/Mono.Posix/Mono.Posix.csproj
  12. +0 −7 src/Xamarin.Android.Build.Tasks/Tasks/Aot.cs
  13. +0 −1 src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
  14. +0 −1 src/Xamarin.Android.Build.Tasks/Tasks/MakeBundleNativeCodeExternal.cs
  15. +0 −10 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.OSS.cs
  16. +1 −2 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
  17. +0 −1 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs
  18. +0 −2 src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
  19. +0 −1 src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
  20. +0 −1 src/Xamarin.Android.Build.Tasks/Utilities/Profile.cs
  21. +1 −1 src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
  22. +14 −27 src/mono-runtimes/mono-runtimes.projitems
  23. +0 −1 src/sqlite-xamarin/sqlite-xamarin.targets
  24. +1 −1 src/sqlite-xamarin/src/main/jni/Application.mk
  25. +0 −1 tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
  26. +1 −1 tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/jni/Application.mk
  27. +0 −5 tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Properties/AssemblyInfo.cs
  28. +0 −1 .../Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj
  29. +2 −2 ...Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets
  30. +1 −2 tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/jni/Application.mk
  31. +1 −2 tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/simple2/jni/Application.mk
  32. +0 −1 tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-Tests/Xamarin.Android.MakeBundle-Tests.csproj
  33. +0 −1 ...eImports/Xamarin.Android.BindingResolveImportLib2/Xamarin.Android.BindingResolveImportLib2.csproj
  34. +1 −1 tests/ResolveImports/Xamarin.Android.BindingResolveImportLib2/jni/Application.mk
  35. +0 −1 ...eImports/Xamarin.Android.BindingResolveImportLib4/Xamarin.Android.BindingResolveImportLib4.csproj
  36. +1 −1 tests/ResolveImports/Xamarin.Android.BindingResolveImportLib4/jni/Application.mk
@@ -9,32 +9,29 @@
<!--
Colon-separated list of ABIs to build the mono JIT for.
Supported ABIs include:
- armeabi
- armeabi-v7a
- arm64-v8a
- x86
- x86_64
Note: Why colon? Because comma `,` and semicolon `;` can't be specified on the command-line.
-->
<AndroidSupportedTargetJitAbis>armeabi:armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
<AndroidSupportedTargetJitAbis>armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
<!--
Colon-separated list of ABIs to build AOT cross-compilers for. Note that there is no configuration
to build the armeabi-v7a cross-compiler. This is intentional as the ARMv6 cross-compiler takes care
of that target as well.
Colon-separated list of ABIs to build AOT cross-compilers for.
There doesn't need to be any parity between the AOT targets and the JIT ABIs above.
Supported targets are:
- armeabi
- win-armeabi
- armeabi-v7a
- win-armeabi-v7a
- arm64
- win-arm64
- x86
- win-x86
- x86_64
- win-x86_64
-->
<AndroidSupportedTargetAotAbis>armeabi:win-armeabi:arm64:win-arm64:x86:win-x86:x86_64:win-x86_64</AndroidSupportedTargetAotAbis>
<AndroidSupportedTargetAotAbis>armeabi-v7a:win-armeabi-v7a:arm64:win-arm64:x86:win-x86:x86_64:win-x86_64</AndroidSupportedTargetAotAbis>
<!--
Colon-separated list of ABIs to build a "host" mono JIT for.
The host JIT is used for the designer in Visual Studio, among other things.
View
@@ -79,7 +79,7 @@
<ProGuardSourceDirectory Condition=" '$(ProGuardSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\proguard</ProGuardSourceDirectory>
<SqliteSourceDirectory Condition=" '$(SqliteSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\sqlite</SqliteSourceDirectory>
<XamarinAndroidSourcePath>$(MSBuildThisFileDirectory)</XamarinAndroidSourcePath>
<AllSupported32BitTargetAndroidAbis>armeabi;armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
<AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
<AllSupported64BitTargetAndroidAbis>arm64-v8a;x86_64</AllSupported64BitTargetAndroidAbis>
<AllSupportedTargetAndroidAbis>$(AllSupported32BitTargetAndroidAbis);$(AllSupported64BitTargetAndroidAbis)</AllSupportedTargetAndroidAbis>
<XABuildToolsVersion>28</XABuildToolsVersion>
@@ -95,7 +95,6 @@ Overridable MSBuild properties include:
the Mono JIT for inclusion within apps. This is a `:`-separated list of
ABIs to build. Supported values are:
* `armeabi`
* `armeabi-v7a`
* `arm64-v8a`
* `x86`
@@ -147,4 +146,4 @@ Overridable MSBuild properties include:
signals `proprietary.csproj` to copy proprietary assemblies from your system's
Xamarin.Android install to the local build output. This enables proprietary
features such as debugging and fast deployment. Since a "normal" OSS build would
not include proprietary files, this flag also emits a warning when enabled.
not include proprietary files, this flag also emits a warning when enabled.
@@ -227,10 +227,6 @@ down in the document:
# of whether a cached copy was used.
rebuild-mono
# Rebuild and install Mono runtime for the armeabi architecture only regardless
# of whether a cached copy was used.
rebuild-armeabi-mono
# Rebuild and install Mono runtime for the armeabi-v7a architecture only regardless
# of whether a cached copy was used.
rebuild-armeabi-v7a-mono
@@ -403,7 +403,6 @@ when packaing Release applications.
Supported values include:
- `armeabi`
- `armeabi-v7a`
- `x86`
- `arm64-v8a`: Requires Xamarin.Android 5.1 and later.
@@ -598,7 +597,6 @@ when packaing Release applications.
Pre defined key items
- **abi** &ndash; Inserts the targetted abi for the app
- 1 &ndash; `armeabi`
- 2 &ndash; `armeabi-v7a`
- 3 &ndash; `x86`
- 4 &ndash; `arm64-v8a`
@@ -1017,8 +1015,8 @@ built for. There are two ways this can be done:
With path sniffing, the parent directory name of the native library is
used to specify the ABI that the library targets. Thus, if you add
`lib/armeabi/libfoo.so` to the build, then the ABI will be "sniffed" as
`armeabi`.
`lib/armeabi-v7a/libfoo.so` to the build, then the ABI will be "sniffed" as
`armeabi-v7a`.
#### Item Attribute Name
@@ -1028,7 +1026,7 @@ used to specify the ABI that the library targets. Thus, if you add
```xml
<ItemGroup>
<AndroidNativeLibrary Include="path/to/libfoo.so">
<Abi>armeabi</Abi>
<Abi>armeabi-v7a</Abi>
</AndroidNativeLibrary>
</ItemGroup>
```
@@ -17,7 +17,7 @@ solution is to add an additional architecture under the
You may also modify the MSBuild property, as in the following example
that includes all ABIs:
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
<AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
An example message would be:
- `error ADB0020: Failure [INSTALL_FAILED_NO_MATCHING_ABIS]: Failed to extract native libraries`
@@ -31,5 +31,5 @@ Common causes:
- Place any Android native libraries within a directory in your
Xamarin.Android project named with the appropriate ABI, such as
`arm64-v8a`, `armeabi`, `armeabi-v7a`, `x86`, or `x86_64`.
`arm64-v8a`, `armeabi-v7a`, `x86`, or `x86_64`.
- Remove any duplicate instances of the native library.
@@ -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 \
@@ -49,22 +48,18 @@ ALL_HOST_ABIS = \
$(shell uname)
ALL_AOT_ABIS = \
armeabi \
arm64 \
x86 \
x86_64 \
win-armeabi-v7a \
win-arm64 \
win-x86 \
win-x86_64
ifneq ($(OS_NAME),Linux)
ALL_HOST_ABIS += \
mxe-Win32 \
mxe-Win64
ALL_AOT_ABIS += \
win-armeabi \
win-arm64 \
win-x86 \
win-x86_64
endif
ifneq ($(OS_NAME),Linux)
@@ -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" />
@@ -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
@@ -263,9 +263,6 @@
<EmbeddedNativeLibrary Include="$(XANativeLibsDir)\arm64-v8a\libMonoPosixHelper.so" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':arm64-v8a:'))">
<Link>MonoPosixHelper\arm64-v8a\libMonoPosixHelper.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="$(XANativeLibsDir)\armeabi\libMonoPosixHelper.so" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi:'))">
<Link>MonoPosixHelper\armeabi\libMonoPosixHelper.so</Link>
</EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="$(XANativeLibsDir)\armeabi-v7a\libMonoPosixHelper.so" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
<Link>MonoPosixHelper\armeabi-v7a\libMonoPosixHelper.so</Link>
</EmbeddedNativeLibrary>
@@ -319,13 +319,6 @@ IEnumerable<Config> GetAotConfigs ()
AndroidTargetArch arch;
switch (abi) {
case "armeabi":
aotCompiler = Path.Combine (sdkBinDirectory, "cross-arm");
outdir = Path.Combine (AotOutputDirectory, "armeabi");
mtriple = "armv5-linux-gnueabi";
arch = AndroidTargetArch.Arm;
break;
case "armeabi-v7a":
aotCompiler = Path.Combine (sdkBinDirectory, "cross-arm");
outdir = Path.Combine (AotOutputDirectory, "armeabi-v7a");
@@ -437,7 +437,6 @@ class LibInfo
static readonly string[] ArmAbis = new[]{
"arm64-v8a",
"armeabi-v7a",
"armeabi",
};
public static readonly string[] ValidProfilers = new[]{
@@ -87,7 +87,6 @@ bool DoExecute ()
case "aarch64":
arch = AndroidTargetArch.Arm64;
break;
case "armeabi":
case "armeabi-v7a":
arch = AndroidTargetArch.Arm;
break;
@@ -13,16 +13,6 @@ public partial class BuildTest : BaseTest
{
#pragma warning disable 414
static object [] AotChecks = new object [] {
new object[] {
/* supportedAbis */ "armeabi",
/* enableLLVM */ false,
/* expectedResult */ true,
},
new object[] {
/* supportedAbis */ "armeabi",
/* enableLLVM */ true,
/* expectedResult */ true,
},
new object[] {
/* supportedAbis */ "armeabi-v7a",
/* enableLLVM */ false,
@@ -1668,7 +1668,7 @@ public void BuildWithNativeLibraries ([Values (true, false)] bool isRelease)
data = ZipHelper.ReadFileFromZip (zipFile, "lib/armeabi-v7a/libtest1.so");
Assert.IsNotNull (data, "libtest1.so for armeabi-v7a should exist in the apk.");
data = ZipHelper.ReadFileFromZip (zipFile, "lib/armeabi-v7a/libRSSupport.so");
Assert.IsNotNull (data, "libRSSupport.so for armeabi should exist in the apk.");
Assert.IsNotNull (data, "libRSSupport.so for armeabi-v7a should exist in the apk.");
}
}
}
@@ -2794,7 +2794,6 @@ public void BuildAMassiveApp()
<Target Name=""_CheckAbis"" BeforeTargets=""_DefineBuildTargetAbis"">
<PropertyGroup>
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
<AndroidSupportedAbis Condition=""Exists('$(MSBuildThisFileDirectory)..\..\..\..\Debug\lib\xamarin.android\xbuild\Xamarin\Android\lib\armeabi\libmono-android.release.so')"">$(AndroidSupportedAbis);armeabi</AndroidSupportedAbis>
<AndroidSupportedAbis Condition=""Exists('$(MSBuildThisFileDirectory)..\..\..\..\Debug\lib\xamarin.android\xbuild\Xamarin\Android\lib\arm64-v8a\libmono-android.release.so')"">$(AndroidSupportedAbis);arm64-v8a</AndroidSupportedAbis>
<AndroidSupportedAbis Condition=""Exists('$(MSBuildThisFileDirectory)..\..\..\..\Debug\lib\xamarin.android\xbuild\Xamarin\Android\lib\x86_64\libmono-android.release.so')"">$(AndroidSupportedAbis);x86_64</AndroidSupportedAbis>
</PropertyGroup>
@@ -153,7 +153,6 @@ public bool CrossCompilerAvailable (string supportedAbis)
{
var crossCompilerLookup = new Dictionary<string, string> {
{ "armeabi-v7a", "cross-arm" },
{ "armeabi", "cross-arm" },
{ "x86", "cross-x86" },
{ "x86_64", "cross-x86_64" },
{ "arm64-v8a", "cross-arm64" },
@@ -956,8 +956,6 @@ public string GetLaunchableActivityName ()
static int GetAbiCode (string abi)
{
switch (abi) {
case "armeabi":
return 1;
case "armeabi-v7a":
return 2;
case "x86":
@@ -246,7 +246,6 @@ public static void LogWarning (object log, string msg, params object [] args)
static readonly string[] ValidAbis = new[]{
"arm64-v8a",
"armeabi",
"armeabi-v7a",
"x86",
"x86_64",
@@ -31,7 +31,6 @@ public partial class Profile
// KEEP THIS SORTED ALPHABETICALLY, CASE-INSENSITIVE
public static readonly string[] ValidAbis = new[]{
"arm64-v8a",
"armeabi",
"armeabi-v7a",
"x86",
"x86_64",
@@ -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>
@@ -10,33 +10,20 @@
runtime's build
-->
<PropertyGroup>
<_ArmeabiRuntimeConfigure Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi:')) ">true</_ArmeabiRuntimeConfigure>
<_ArmeabiRuntimeBuild Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi:'))">true</_ArmeabiRuntimeBuild>
<_ArmeabiV7aRuntimeConfigure Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:')) ">true</_ArmeabiV7aRuntimeConfigure>
<_ArmeabiV7aRuntimeBuild Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:'))">true</_ArmeabiV7aRuntimeBuild>
</PropertyGroup>
<ItemGroup>
<_MonoRuntime Include="armeabi" Condition=" '$(_ArmeabiRuntimeConfigure)' == 'true' ">
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-clang\bin\arm-linux-androideabi-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
<OutputMonoBtlsFilename>libmono-btls-shared</OutputMonoBtlsFilename>
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
<DoBuild>$(_ArmeabiRuntimeBuild)</DoBuild>
</_MonoRuntime>
</ItemGroup>
<!-- Cross compiler doesn't need this one, it uses the 'armeabi' build above. Thus no PropertyGroup here. -->
<ItemGroup>
<_MonoRuntime Include="armeabi-v7a" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
<_MonoRuntime Include="armeabi-v7a" Condition=" '$(_ArmeabiV7aRuntimeConfigure)' == 'true' ">
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
<OutputMonoBtlsFilename>libmono-btls-shared</OutputMonoBtlsFilename>
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
<DoBuild>true</DoBuild>
<DoBuild>$(_ArmeabiV7aRuntimeBuild)</DoBuild>
</_MonoRuntime>
</ItemGroup>
@@ -170,7 +157,7 @@
<ItemGroup>
<!-- LLVM -->
<_LlvmRuntime Include="llvm32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86:'))) ">
<_LlvmRuntime Include="llvm32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86:'))) ">
<ExeSuffix></ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
@@ -186,7 +173,7 @@
<PackageOptions>llvm-llvm64_CC="$(HostCc64)" llvm-llvm64_CXX="$(HostCxx64)"</PackageOptions>
</_LlvmRuntime>
<_LlvmRuntime Include="llvmwin32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))) ">
<_LlvmRuntime Include="llvmwin32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))) ">
<ExeSuffix>.exe</ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath></InstallPath>
@@ -201,8 +188,8 @@
<ItemGroup>
<!-- cross compilers -->
<_MonoCrossRuntime Include="cross-arm" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi:'))">
<JitArch>armeabi</JitArch>
<_MonoCrossRuntime Include="cross-arm" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
<JitArch>armeabi-v7a</JitArch>
<Ar>ar</Ar>
<As>as</As>
<Cc>$(HostCc32)</Cc>
@@ -215,8 +202,8 @@
<RanLib>ranlib</RanLib>
<Strip>strip</Strip>
<StripFlags>-S</StripFlags>
<TargetAbi>armv5-none-linux-androideabi</TargetAbi>
<ConfigureFlags>--target=armv5-linux-androideabi --with-cross-offsets=armv5-none-linux-androideabi.h $(_CrossConfigureFlags32) --with-llvm=$(_LlvmPrefix32)</ConfigureFlags>
<TargetAbi>armv7-none-linux-androideabi</TargetAbi>
<ConfigureFlags>--target=armv7-linux-androideabi --with-cross-offsets=armv7-none-linux-androideabi.h $(_CrossConfigureFlags32) --with-llvm=$(_LlvmPrefix32)</ConfigureFlags>
<ExeSuffix></ExeSuffix>
<BuildEnvironment></BuildEnvironment>
<ConfigureEnvironment></ConfigureEnvironment>
@@ -297,8 +284,8 @@
<CrossMonoName>cross-x86_64</CrossMonoName>
</_MonoCrossRuntime>
<_MonoCrossRuntime Include="cross-arm-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi:'))">
<JitArch>armeabi</JitArch>
<_MonoCrossRuntime Include="cross-arm-win" Condition="$(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:'))">
<JitArch>armeabi-v7a</JitArch>
<Ar>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ar</Ar>
<As>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-as</As>
<Cc>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-gcc</Cc>
@@ -311,8 +298,8 @@
<RanLib>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-ranlib</RanLib>
<Strip>$(AndroidMxeFullPath)\bin\$(MingwCommandPrefix32)-strip</Strip>
<StripFlags>-S</StripFlags>
<TargetAbi>armv5-none-linux-androideabi</TargetAbi>
<ConfigureFlags>--target=armv5-linux-androideabi --host="$(_CrossConfigureBuildHostWin32)" --with-cross-offsets=armv5-none-linux-androideabi.h $(_CrossConfigureFlags32) --with-llvm=$(_LlvmPrefixWin32)</ConfigureFlags>
<TargetAbi>armv7-none-linux-androideabi</TargetAbi>
<ConfigureFlags>--target=armv7-linux-androideabi --host="$(_CrossConfigureBuildHostWin32)" --with-cross-offsets=armv7-none-linux-androideabi.h $(_CrossConfigureFlags32) --with-llvm=$(_LlvmPrefixWin32)</ConfigureFlags>
<ExeSuffix>.exe</ExeSuffix>
<BuildEnvironment>PATH="$(AndroidMxeFullPath)\bin:$(PATH)"</BuildEnvironment>
<ConfigureEnvironment>PATH="$(AndroidMxeFullPath)\bin:$(PATH)"</ConfigureEnvironment>
@@ -12,7 +12,6 @@
<!-- build outputs include (if enabled):
src/main/libs/x86/libsqlite3_xamarin.so
src/main/libs/armeabi-v7a/libsqlite3_xamarin.so
src/main/libs/armeabi/libsqlite3_xamarin.so
src/main/libs/arm64-v8a/libsqlite3_xamarin.so
src/main/libs/x86_64/libsqlite3_xamarin.so
-->
@@ -1 +1 @@
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
Oops, something went wrong.

0 comments on commit 9abbfc4

Please sign in to comment.