Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily disable downloading native libs in android [ci full] #4846

Merged
merged 7 commits into from
May 11, 2022

Conversation

tarikeshaq
Copy link
Contributor

Disable downloading native libraries, forcing local environments to build the native libraries (nss, etc) themselves.

This is because for macs, the useDownloadedLibs flow is broken, since after #4792 NSS_DIR is expected to be point to a darwin-x86-64 or darwin-aarch64 when the downloaded libraries always have them in a darwin directory.

The alternative is to force set the NSS_DIR to point to darwin in gradle, but that won't work for M1s, since the downloaded libs don't have M1 builds anyways

@codecov-commenter
Copy link

codecov-commenter commented Feb 15, 2022

Codecov Report

Merging #4846 (ad17300) into main (c2823f5) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #4846   +/-   ##
=======================================
  Coverage   38.42%   38.42%           
=======================================
  Files         166      166           
  Lines       12343    12343           
=======================================
  Hits         4743     4743           
  Misses       7600     7600           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c2823f5...ad17300. Read the comment docs.

@skhamis
Copy link
Contributor

skhamis commented Feb 15, 2022

Nice catch! I thought cross-compile-target was CI. So technically darwin is still there for CI?

elif [[ "${CROSS_COMPILE_TARGET}" =~ "darwin" ]]; then
DIST_DIR=$(abspath "desktop/darwin/nss")
TARGET_OS="macos"

elif [[ "${CROSS_COMPILE_TARGET}" =~ "darwin" ]]; then
DIST_DIR=$(abspath "desktop/darwin/sqlcipher")
NSS_DIR=$(abspath "desktop/darwin/nss")

@tarikeshaq
Copy link
Contributor Author

Came across this again trying to build app services on android - I'll land this for now, if I notice this breaking for anyone's local environment (it shouldn't, but 🤷) I'll revert it

@tarikeshaq tarikeshaq merged commit 15c96ab into main May 11, 2022
@tarikeshaq tarikeshaq deleted the disable-downloaded-libs-android branch May 11, 2022 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants