diff options
author | Jose <jose@zeroc.com> | 2019-06-07 11:33:31 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-06-07 11:33:31 +0200 |
commit | 7d9486b9113d5bbb533ced14d4e145faf97dcda2 (patch) | |
tree | 6c7899e633ddf97c03df49156b1483b23010da3b /csharp/test/xamarin/controller.Android/controller.Android.csproj | |
parent | Fix code format fixes (diff) | |
parent | JavaScript browser testing fixes (diff) | |
download | ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.tar.bz2 ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.tar.xz ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.zip |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'csharp/test/xamarin/controller.Android/controller.Android.csproj')
-rw-r--r-- | csharp/test/xamarin/controller.Android/controller.Android.csproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/test/xamarin/controller.Android/controller.Android.csproj b/csharp/test/xamarin/controller.Android/controller.Android.csproj index a72fdfdbdb6..5c1dc4bbda6 100644 --- a/csharp/test/xamarin/controller.Android/controller.Android.csproj +++ b/csharp/test/xamarin/controller.Android/controller.Android.csproj @@ -54,7 +54,7 @@ <EnableLLVM>false</EnableLLVM> <BundleAssemblies>false</BundleAssemblies> <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi> - <AndroidSupportedAbis>armeabi;armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis> + <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <AndroidEnableMultiDex>true</AndroidEnableMultiDex> <AndroidLinkMode>SdkOnly</AndroidLinkMode> @@ -134,4 +134,4 @@ </ProjectReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> -</Project>
\ No newline at end of file +</Project> |