Skip to content

Commit

Permalink
Merge pull request #2465 from mavlink/android-use-boringssl
Browse files Browse the repository at this point in the history
Android use boringssl
  • Loading branch information
julianoes authored Dec 12, 2024
2 parents abf0167 + 5d93383 commit 2fb036c
Show file tree
Hide file tree
Showing 81 changed files with 203,671 additions and 153,989 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
android: 'false'
continue-on-error: true
- uses: actions/cache@v4
id: cache
with:
Expand Down
4 changes: 4 additions & 0 deletions src/mavsdk/core/curl_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ bool CurlWrapper::download_text(const std::string& url, std::string& content)
curl_easy_setopt(curl.get(), CURLOPT_URL, url.c_str());
curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, write_callback);
curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, &readBuffer);
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 1L);
curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1L);
res = curl_easy_perform(curl.get());
content = readBuffer;

Expand Down Expand Up @@ -108,6 +110,8 @@ bool CurlWrapper::download_file_to_path(
curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, fp);
curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 0L);
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 1L);
curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1L);
res = curl_easy_perform(curl.get());
fclose(fp);

Expand Down
9,466 changes: 5,836 additions & 3,630 deletions src/mavsdk_server/src/generated/action/action.pb.cc

Large diffs are not rendered by default.

6,615 changes: 3,592 additions & 3,023 deletions src/mavsdk_server/src/generated/action/action.pb.h

Large diffs are not rendered by default.

6,160 changes: 3,823 additions & 2,337 deletions src/mavsdk_server/src/generated/action_server/action_server.pb.cc

Large diffs are not rendered by default.

4,302 changes: 2,329 additions & 1,973 deletions src/mavsdk_server/src/generated/action_server/action_server.pb.h

Large diffs are not rendered by default.

1,672 changes: 1,004 additions & 668 deletions src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.cc

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3,165 changes: 1,972 additions & 1,193 deletions src/mavsdk_server/src/generated/calibration/calibration.pb.cc

Large diffs are not rendered by default.

2,324 changes: 1,246 additions & 1,078 deletions src/mavsdk_server/src/generated/calibration/calibration.pb.h

Large diffs are not rendered by default.

18,993 changes: 11,392 additions & 7,601 deletions src/mavsdk_server/src/generated/camera/camera.pb.cc

Large diffs are not rendered by default.

Loading

0 comments on commit 2fb036c

Please sign in to comment.