Skip to content

Commit c9dda98

Browse files
ras0219-msftras0219-msft
committed
Set android projects to properly use boost.1.55. Set clang version to 3.6.
1 parent 525b189 commit c9dda98

File tree

15 files changed

+93
-93
lines changed

15 files changed

+93
-93
lines changed

‎Release/src/build/vs14.android/casablanca140.android.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<CppLanguageStandard>c++11</CppLanguageStandard>
7272
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7373
<TreatWarningAsError>true</TreatWarningAsError>
74-
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
74+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
7575
</ClCompile>
7676
</ItemDefinitionGroup>
7777
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -82,7 +82,7 @@
8282
<ExceptionHandling>Enabled</ExceptionHandling>
8383
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8484
<TreatWarningAsError>true</TreatWarningAsError>
85-
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
85+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
8686
</ClCompile>
8787
</ItemDefinitionGroup>
8888
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -93,7 +93,7 @@
9393
<ExceptionHandling>Enabled</ExceptionHandling>
9494
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9595
<TreatWarningAsError>true</TreatWarningAsError>
96-
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
96+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
9797
</ClCompile>
9898
</ItemDefinitionGroup>
9999
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -104,7 +104,7 @@
104104
<ExceptionHandling>Enabled</ExceptionHandling>
105105
<RuntimeTypeInfo>true</RuntimeTypeInfo>
106106
<TreatWarningAsError>true</TreatWarningAsError>
107-
<AdditionalOptions>-funwind-tables -Wno-unused-local-typedef </AdditionalOptions>
107+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
108108
</ClCompile>
109109
</ItemDefinitionGroup>
110110
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -118,13 +118,13 @@
118118
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
119119
<ImportGroup Label="ExtensionTargets">
120120
<Import Project="..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
121-
<Import Project="..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
121+
<Import Project="..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
122122
</ImportGroup>
123123
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124124
<PropertyGroup>
125125
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
126126
</PropertyGroup>
127127
<Error Condition="!Exists('..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
128-
<Error Condition="!Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets'))" />
128+
<Error Condition="!Exists('..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets'))" />
129129
</Target>
130-
</Project>
130+
</Project>

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@
277277
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets'))" />
278278
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets'))" />
279279
</Target>
280-
</Project>
280+
</Project>

‎Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@
103103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
104104
<ConfigurationType>StaticLibrary</ConfigurationType>
105105
<UseDebugLibraries>true</UseDebugLibraries>
106-
<PlatformToolset>Clang_3_4</PlatformToolset>
106+
<PlatformToolset>Clang_3_6</PlatformToolset>
107107
<UseOfStl>gnustl_static</UseOfStl>
108108
</PropertyGroup>
109109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
110110
<ConfigurationType>StaticLibrary</ConfigurationType>
111111
<UseDebugLibraries>true</UseDebugLibraries>
112-
<PlatformToolset>Clang_3_4</PlatformToolset>
112+
<PlatformToolset>Clang_3_6</PlatformToolset>
113113
<UseOfStl>gnustl_static</UseOfStl>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
116116
<ConfigurationType>StaticLibrary</ConfigurationType>
117117
<UseDebugLibraries>false</UseDebugLibraries>
118-
<PlatformToolset>Clang_3_4</PlatformToolset>
118+
<PlatformToolset>Clang_3_6</PlatformToolset>
119119
<UseOfStl>gnustl_static</UseOfStl>
120120
</PropertyGroup>
121121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
122122
<ConfigurationType>StaticLibrary</ConfigurationType>
123123
<UseDebugLibraries>false</UseDebugLibraries>
124-
<PlatformToolset>Clang_3_4</PlatformToolset>
124+
<PlatformToolset>Clang_3_6</PlatformToolset>
125125
<UseOfStl>gnustl_static</UseOfStl>
126126
</PropertyGroup>
127127
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -187,13 +187,13 @@
187187
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
188188
<ImportGroup Label="ExtensionTargets">
189189
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
190-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
190+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
191191
</ImportGroup>
192192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
193193
<PropertyGroup>
194194
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
195195
</PropertyGroup>
196196
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
197-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
197+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
198198
</Target>
199-
</Project>
199+
</Project>

‎Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,25 @@
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
5555
<ConfigurationType>StaticLibrary</ConfigurationType>
5656
<UseDebugLibraries>true</UseDebugLibraries>
57-
<PlatformToolset>Clang_3_4</PlatformToolset>
57+
<PlatformToolset>Clang_3_6</PlatformToolset>
5858
<UseOfStl>gnustl_static</UseOfStl>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
6161
<ConfigurationType>StaticLibrary</ConfigurationType>
6262
<UseDebugLibraries>true</UseDebugLibraries>
63-
<PlatformToolset>Clang_3_4</PlatformToolset>
63+
<PlatformToolset>Clang_3_6</PlatformToolset>
6464
<UseOfStl>gnustl_static</UseOfStl>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
6767
<ConfigurationType>StaticLibrary</ConfigurationType>
6868
<UseDebugLibraries>false</UseDebugLibraries>
69-
<PlatformToolset>Clang_3_4</PlatformToolset>
69+
<PlatformToolset>Clang_3_6</PlatformToolset>
7070
<UseOfStl>gnustl_static</UseOfStl>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseDebugLibraries>false</UseDebugLibraries>
75-
<PlatformToolset>Clang_3_4</PlatformToolset>
75+
<PlatformToolset>Clang_3_6</PlatformToolset>
7676
<UseOfStl>gnustl_static</UseOfStl>
7777
</PropertyGroup>
7878
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -136,13 +136,13 @@
136136
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
137137
<ImportGroup Label="ExtensionTargets">
138138
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
139-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
139+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
140140
</ImportGroup>
141141
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
142142
<PropertyGroup>
143143
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
144144
</PropertyGroup>
145145
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
146-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
146+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
147147
</Target>
148-
</Project>
148+
</Project>

‎Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,25 @@
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseDebugLibraries>true</UseDebugLibraries>
75-
<PlatformToolset>Clang_3_4</PlatformToolset>
75+
<PlatformToolset>Clang_3_6</PlatformToolset>
7676
<UseOfStl>gnustl_static</UseOfStl>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
7979
<ConfigurationType>StaticLibrary</ConfigurationType>
8080
<UseDebugLibraries>true</UseDebugLibraries>
81-
<PlatformToolset>Clang_3_4</PlatformToolset>
81+
<PlatformToolset>Clang_3_6</PlatformToolset>
8282
<UseOfStl>gnustl_static</UseOfStl>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
8585
<ConfigurationType>StaticLibrary</ConfigurationType>
8686
<UseDebugLibraries>false</UseDebugLibraries>
87-
<PlatformToolset>Clang_3_4</PlatformToolset>
87+
<PlatformToolset>Clang_3_6</PlatformToolset>
8888
<UseOfStl>gnustl_static</UseOfStl>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
9191
<ConfigurationType>StaticLibrary</ConfigurationType>
9292
<UseDebugLibraries>false</UseDebugLibraries>
93-
<PlatformToolset>Clang_3_4</PlatformToolset>
93+
<PlatformToolset>Clang_3_6</PlatformToolset>
9494
<UseOfStl>gnustl_static</UseOfStl>
9595
</PropertyGroup>
9696
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -156,13 +156,13 @@
156156
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
157157
<ImportGroup Label="ExtensionTargets">
158158
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
159-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
159+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
160160
</ImportGroup>
161161
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162162
<PropertyGroup>
163163
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
164164
</PropertyGroup>
165165
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
166-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
166+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
167167
</Target>
168-
</Project>
168+
</Project>

‎Release/tests/functional/http/client/vs14.android/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="openssl-android" version="1.0.1" targetFramework="Native" />
4+
<package id="openssl-android" version="1.0.2.0" targetFramework="Native" />
55
</packages>

‎Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,25 @@
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
6565
<ConfigurationType>StaticLibrary</ConfigurationType>
6666
<UseDebugLibraries>true</UseDebugLibraries>
67-
<PlatformToolset>Clang_3_4</PlatformToolset>
67+
<PlatformToolset>Clang_3_6</PlatformToolset>
6868
<UseOfStl>gnustl_static</UseOfStl>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
7171
<ConfigurationType>StaticLibrary</ConfigurationType>
7272
<UseDebugLibraries>true</UseDebugLibraries>
73-
<PlatformToolset>Clang_3_4</PlatformToolset>
73+
<PlatformToolset>Clang_3_6</PlatformToolset>
7474
<UseOfStl>gnustl_static</UseOfStl>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
7777
<ConfigurationType>StaticLibrary</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>Clang_3_4</PlatformToolset>
79+
<PlatformToolset>Clang_3_6</PlatformToolset>
8080
<UseOfStl>gnustl_static</UseOfStl>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
8383
<ConfigurationType>StaticLibrary</ConfigurationType>
8484
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>Clang_3_4</PlatformToolset>
85+
<PlatformToolset>Clang_3_6</PlatformToolset>
8686
<UseOfStl>gnustl_static</UseOfStl>
8787
</PropertyGroup>
8888
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -148,13 +148,13 @@
148148
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
149149
<ImportGroup Label="ExtensionTargets">
150150
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
151-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
151+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
152152
</ImportGroup>
153153
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
154154
<PropertyGroup>
155155
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
156156
</PropertyGroup>
157157
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
158-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
158+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
159159
</Target>
160-
</Project>
160+
</Project>

0 commit comments

Comments
 (0)