Skip to content

Commit

Permalink
This merges parts of:
Browse files Browse the repository at this point in the history
* PR microsoft#662 "Overhaul the build process for the OpenSSL dependency on
  Android" by jwtowner
* PR microsoft#711 "Update the build process for Boost on Android", also by
  jwtowner
* PR microsoft#714 "Improved the build process for cpprestsdk on Android", also
  by jwtowner.

The changes which required patching upstream Boost-for-Android in those
PRs has been stripped.

The NDK version targeted has been updated to 17c because that's what's
avaialble in Azure Pipelines.

Various compile failures this uncovered in cpprestsdk on Android were
fixed.
  • Loading branch information
BillyONeal committed Oct 18, 2018
1 parent 3a140eb commit 8c4cdec
Show file tree
Hide file tree
Showing 20 changed files with 848 additions and 627 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ build.*/
docs/
# Ignore NuGet artifacts
.nuget/
Build_android/build/
Generated Files/
# Ignore iOS temp build directories
Build_iOS/Apple-Boost-BuildScript
Build_iOS/Apple-Boost-BuildScript
173 changes: 0 additions & 173 deletions Build_android/boost-for-android-x86.patch

This file was deleted.

175 changes: 0 additions & 175 deletions Build_android/boost-for-android.patch

This file was deleted.

Loading

0 comments on commit 8c4cdec

Please sign in to comment.