Skip to content

Commit 0e09d1d

Browse files
committed
Remove unused references to boost_locale and libiconv in android projects. Revert change to boost 1.59 for android projects.
1 parent 25ef2d7 commit 0e09d1d

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,11 @@
254254
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
255255
<ImportGroup Label="ExtensionTargets">
256256
<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')" />
257-
<Import Project="..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
257+
<Import Project="..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets')" />
258258
<Import Project="..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" />
259-
<Import Project="..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets" Condition="Exists('..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets')" />
260259
<Import Project="..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" />
261260
<Import Project="..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" />
262261
<Import Project="..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" />
263-
<Import Project="..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets')" />
264262
<Import Project="..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" />
265263
<Import Project="..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" />
266264
<Import Project="..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" />
@@ -270,13 +268,11 @@
270268
<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>
271269
</PropertyGroup>
272270
<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'))" />
273-
<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'))" />
271+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets'))" />
274272
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets'))" />
275-
<Error Condition="!Exists('..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets'))" />
276273
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets'))" />
277274
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets'))" />
278275
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets'))" />
279-
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets'))" />
280276
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets'))" />
281277
<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'))" />
282278
<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'))" />
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.59.0.0" targetFramework="native" />
3+
<package id="boost" version="1.55.0.16" targetFramework="native" />
44
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
55
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
66
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
77
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
8-
<package id="boost_locale-android" version="1.55.0.1" targetFramework="native" />
98
<package id="boost_random-android" version="1.55.0.1" targetFramework="native" />
109
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
1110
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
12-
<package id="libiconv-android" version="1.13.1.1" targetFramework="native" />
1311
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
1412
</packages>

0 commit comments

Comments
 (0)