Skip to content

Commit

Permalink
Enable Android build in CI, update NDK to 17c.
Browse files Browse the repository at this point in the history
This merges parts of:
* 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 16, 2018
1 parent 06619a7 commit a84f685
Show file tree
Hide file tree
Showing 22 changed files with 823 additions and 597 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ build.*/
docs/
# ignore NuGet artifacts
.nuget/

Generated Files/
Build_android/build/
Generated Files/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "websocketspp"]
path = Release/libs/websocketpp
url = https://github.com/zaphoyd/websocketpp/
[submodule "Boost-for-Android"]
path = Build_android/Boost-for-Android
url = https://github.com/moritz-wundke/Boost-for-Android
1 change: 1 addition & 0 deletions Build_android/Boost-for-Android
Submodule Boost-for-Android added at 1bd9aa
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 a84f685

Please sign in to comment.