fix: resolved feature flags for openssl vendoring #3287
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please create as a standalone pr, it's too difficult to review with the changes in 3285 |
|
@mikethetike Will re-base when 3285 merges. Have re-based 3285 already after 3275 merged. |
|
Why not cherry pick it onto a new branch then it can be reviewed now? |
This was referenced Sep 2, 2021
StriderDM
force-pushed
the
fix_opessl_vendoring
branch
from
d7ebbbd to
364e4b1
Compare
|
Have attached build logs. Will cherry pick the commit shortly. |
StriderDM
force-pushed
the
fix_opessl_vendoring
branch
from
364e4b1 to
4232814
Compare
|
@mikethetike Cherry picking done. :) |
Include vendored openssl library when not building ffi wallet library. Exclude vendored openssl library when building ffi wallet library as it needs to be cross compiled for mobile. Restored packages to ci.yml. (cherry picked from commit 364e4b1) Update ci.yml
StriderDM
force-pushed
the
fix_opessl_vendoring
branch
from
4232814 to
51054d8
Compare
stringhandler
previously approved these changes
Sep 17, 2021
stringhandler
approved these changes
Sep 22, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Include vendored openssl library when not building ffi wallet library.
Exclude vendored openssl library when building ffi wallet library as it needs to be cross compiled for mobile which is done in mobile_build.sh.
Merge #3285 first.
We had to do the same for sqlite here:
#3073
Motivation and Context
Current:
This PR:
mobile_build_logs.zip
How Has This Been Tested?
cargo test --all --all-features
nvm use v12.22.6 && ./node_modules/.bin/cucumber-js features/WalletFFI.feature
sh mobile_build.sh