github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use android NDK r19c

Browse source
This commit is contained in:
Jérôme Laban 2019-05-24 14:41:47 -04:00
commit 361503e4ef
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.vsts-ci.Windows.yml
View file

@ -4,6 +4,9 @@ jobs:
pool: pool:
vmImage: 'windows-2019' vmImage: 'windows-2019'
variables:
NDK_ROOT: C:\Microsoft\AndroidNDK64\android-ndk-r19c
steps: steps:
- task: GitVersion@4 - task: GitVersion@4
inputs: inputs:

16
src/CalcManager.Android/CalcManager.Android.vcxproj
View file

@ -105,49 +105,49 @@
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-27</AndroidAPILevel> <AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)/Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)/Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" /> <ImportGroup Label="ExtensionSettings" />