Skip to content

Commit f610e99

Browse files
shanelileshanelile
authored
Add support for building x86_64 for Android (microsoft#435)
1 parent 0ab672b commit f610e99

10 files changed

+54
-22
lines changed

‎Build/libHttpClient.141.Android.C/libHttpClient.141.Android.C.vcxproj

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
<Configuration>Release</Configuration>
2626
<Platform>x86</Platform>
2727
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Debug|x64">
29+
<Configuration>Debug</Configuration>
30+
<Platform>x64</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Release|x64">
33+
<Configuration>Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
2836
</ItemGroup>
2937
<PropertyGroup Label="Globals">
3038
<ProjectGuid>{5e0ce391-1ac5-4930-921e-2577a4b5c530}</ProjectGuid>
3139
<Keyword>Android</Keyword>
3240
<PlatformToolset>Clang_5_0</PlatformToolset>
33-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
34-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
41+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
42+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
3543
<RootNamespace>libHttpClient_141_Android_C</RootNamespace>
3644
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3745
<ApplicationType>Android</ApplicationType>

‎Build/libHttpClient.142.Android.C/libHttpClient.142.Android.C.vcxproj

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
<Configuration>Release</Configuration>
2626
<Platform>x86</Platform>
2727
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Debug|x64">
29+
<Configuration>Debug</Configuration>
30+
<Platform>x64</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Release|x64">
33+
<Configuration>Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
2836
</ItemGroup>
2937
<PropertyGroup Label="Globals">
3038
<ProjectGuid>{5e0ce391-1ac5-4930-921e-2577a4b5c530}</ProjectGuid>
3139
<Keyword>Android</Keyword>
3240
<PlatformToolset>Clang_5_0</PlatformToolset>
33-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
34-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
41+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
42+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
3543
<RootNamespace>libHttpClient_142_Android_C</RootNamespace>
3644
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3745
<ApplicationType>Android</ApplicationType>

‎Build/libcrypto.141.Android/libcrypto.141.Android.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<ApplicationType>Android</ApplicationType>
4242
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
4343
<HCLibPlatformType>Android</HCLibPlatformType>
44-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
45-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
44+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
45+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4848
<PropertyGroup>

‎Build/libcrypto.142.Android/libcrypto.142.Android.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<ApplicationType>Android</ApplicationType>
4242
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
4343
<HCLibPlatformType>Android</HCLibPlatformType>
44-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
45-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
44+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
45+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4848
<PropertyGroup>

‎Build/libssl.141.Android/libssl.141.Android.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4141
<ApplicationType>Android</ApplicationType>
4242
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
43-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
44-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
43+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
44+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
4545
<HCLibPlatformType>Android</HCLibPlatformType>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎Build/libssl.142.Android/libssl.142.Android.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4141
<ApplicationType>Android</ApplicationType>
4242
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
43-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
44-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
43+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
44+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
4545
<HCLibPlatformType>Android</HCLibPlatformType>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎Utilities/CMake/template-libHttpClient.141.Android.C.vcxproj

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
<Configuration>Release</Configuration>
2626
<Platform>x86</Platform>
2727
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Debug|x64">
29+
<Configuration>Debug</Configuration>
30+
<Platform>x64</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Release|x64">
33+
<Configuration>Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
2836
</ItemGroup>
2937
<PropertyGroup Label="Globals">
3038
<ProjectGuid>{5e0ce391-1ac5-4930-921e-2577a4b5c530}</ProjectGuid>
3139
<Keyword>Android</Keyword>
3240
<PlatformToolset>Clang_5_0</PlatformToolset>
33-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
34-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
41+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
42+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
3543
<RootNamespace>libHttpClient_141_Android_C</RootNamespace>
3644
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3745
<ApplicationType>Android</ApplicationType>

‎Utilities/CMake/template-libHttpClient.142.Android.C.vcxproj

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
<Configuration>Release</Configuration>
2626
<Platform>x86</Platform>
2727
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Debug|x64">
29+
<Configuration>Debug</Configuration>
30+
<Platform>x64</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Release|x64">
33+
<Configuration>Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
2836
</ItemGroup>
2937
<PropertyGroup Label="Globals">
3038
<ProjectGuid>{5e0ce391-1ac5-4930-921e-2577a4b5c530}</ProjectGuid>
3139
<Keyword>Android</Keyword>
3240
<PlatformToolset>Clang_5_0</PlatformToolset>
33-
<AndroidAPILevel Condition="'$(Platform)'!='ARM64'">android-19</AndroidAPILevel>
34-
<AndroidAPILevel Condition="'$(Platform)'=='ARM64'">android-21</AndroidAPILevel>
41+
<AndroidAPILevel Condition="'$(Platform)'!='ARM64' AND '$(Platform)'!='x64'">android-19</AndroidAPILevel>
42+
<AndroidAPILevel Condition="'$(Platform)'=='ARM64' OR '$(Platform)'=='x64'">android-21</AndroidAPILevel>
3543
<RootNamespace>libHttpClient_142_Android_C</RootNamespace>
3644
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3745
<ApplicationType>Android</ApplicationType>

‎libHttpClient.vs2017.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Global
216216
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|ARM64.ActiveCfg = Debug|ARM64
217217
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|ARM64.Build.0 = Debug|ARM64
218218
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|Durango.ActiveCfg = Debug|x86
219-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x64.ActiveCfg = Debug|x86
219+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x64.ActiveCfg = Debug|x64
220220
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x86.ActiveCfg = Debug|x86
221221
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x86.Build.0 = Debug|x86
222222
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|Any CPU.ActiveCfg = Release|x86
@@ -226,7 +226,7 @@ Global
226226
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|ARM64.ActiveCfg = Release|ARM64
227227
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|ARM64.Build.0 = Release|ARM64
228228
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|Durango.ActiveCfg = Release|x86
229-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x64.ActiveCfg = Release|x86
229+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x64.ActiveCfg = Release|x64
230230
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x86.ActiveCfg = Release|x86
231231
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x86.Build.0 = Release|x86
232232
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|Any CPU.ActiveCfg = Release|x86
@@ -235,7 +235,7 @@ Global
235235
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|ARM64.ActiveCfg = Release|ARM64
236236
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|ARM64.Build.0 = Release|ARM64
237237
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|Durango.ActiveCfg = Release|x86
238-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x64.ActiveCfg = Release|x86
238+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x64.ActiveCfg = Release|x64
239239
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x86.ActiveCfg = Release|x86
240240
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x86.Build.0 = Release|x86
241241
{00867B85-BAE6-4129-85EA-18CCFA002E00}.Debug|Any CPU.ActiveCfg = Debug|Win32

‎libHttpClient.vs2019.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Global
214214
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|ARM64.ActiveCfg = Debug|ARM64
215215
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|ARM64.Build.0 = Debug|ARM64
216216
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|Durango.ActiveCfg = Debug|x86
217-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x64.ActiveCfg = Debug|x86
217+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x64.ActiveCfg = Debug|x64
218218
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x86.ActiveCfg = Debug|x86
219219
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Debug|x86.Build.0 = Debug|x86
220220
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|Any CPU.ActiveCfg = Release|x86
@@ -224,7 +224,7 @@ Global
224224
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|ARM64.ActiveCfg = Release|ARM64
225225
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|ARM64.Build.0 = Release|ARM64
226226
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|Durango.ActiveCfg = Release|x86
227-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x64.ActiveCfg = Release|x86
227+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x64.ActiveCfg = Release|x64
228228
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x86.ActiveCfg = Release|x86
229229
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Profile|x86.Build.0 = Release|x86
230230
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|Any CPU.ActiveCfg = Release|x86
@@ -233,7 +233,7 @@ Global
233233
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|ARM64.ActiveCfg = Release|ARM64
234234
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|ARM64.Build.0 = Release|ARM64
235235
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|Durango.ActiveCfg = Release|x86
236-
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x64.ActiveCfg = Release|x86
236+
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x64.ActiveCfg = Release|x64
237237
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x86.ActiveCfg = Release|x86
238238
{5E0CE391-1AC5-4930-921E-2577A4B5C530}.Release|x86.Build.0 = Release|x86
239239
{00867B85-BAE6-4129-85EA-18CCFA002E00}.Debug|Any CPU.ActiveCfg = Debug|Win32

0 commit comments

Comments
 (0)