Skip to content

Commit a84f685

Browse files
committed
Enable Android build in CI, update NDK to 17c.
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.
1 parent 06619a7 commit a84f685

22 files changed

+823
-597
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ build.*/
6969
docs/
7070
# ignore NuGet artifacts
7171
.nuget/
72-
73-
Generated Files/
72+
Build_android/build/
73+
Generated Files/

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "websocketspp"]
55
path = Release/libs/websocketpp
66
url = https://github.com/zaphoyd/websocketpp/
7+
[submodule "Boost-for-Android"]
8+
path = Build_android/Boost-for-Android
9+
url = https://github.com/moritz-wundke/Boost-for-Android

Build_android/Boost-for-Android

Submodule Boost-for-Android added at 1bd9aa1

Build_android/boost-for-android-x86.patch

-173
This file was deleted.

Build_android/boost-for-android.patch

-175
This file was deleted.

0 commit comments

Comments
 (0)