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

Update NDK to r27 [ci full] #6305

Merged
merged 2 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# v130.0 (In progress)

## ✨ What's New ✨

### Suggest
- Added support for Fakespot suggestions.

## 🦊 What's Changed 🦊

### Android
- Upgraded NDK from r26c to r27. ([#6305](https://github.com/mozilla/application-services/pull/6305))

### Nimbus FML
- The output order should be deterministic again ([#6283](https://github.com/mozilla/application-services/pull/6283))

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext.build = [
ndkVersion: "26.2.11394342", // Keep it in sync in TC Dockerfile.
ndkVersion: "27.0.12077973", // Keep it in sync in TC Dockerfile.

// In general, we should aim to keep these in sync with AC
compileSdkVersion: 34,
Expand Down
6 changes: 3 additions & 3 deletions components/support/rc_crypto/nss/nss_build_common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ fn link_nss_libs(kind: LinkingKind) {
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
if target_arch == "x86_64" && target_os == "android" {
let android_home = env::var("ANDROID_HOME").expect("ANDROID_HOME not set");
const ANDROID_NDK_VERSION: &str = "26.2.11394342";
const ANDROID_NDK_VERSION: &str = "27.0.12077973";
// One of these will exist, depending on the host platform.
const DARWIN_X86_64_LIB_DIR: &str =
"/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/17/lib/linux/";
"/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/";
println!("cargo:rustc-link-search={android_home}/ndk/{ANDROID_NDK_VERSION}/{DARWIN_X86_64_LIB_DIR}");
const LINUX_X86_64_LIB_DIR: &str =
"/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/17/lib/linux/";
"/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/";
println!("cargo:rustc-link-search={android_home}/ndk/{ANDROID_NDK_VERSION}/{LINUX_X86_64_LIB_DIR}");
println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android");
}
Expand Down
4 changes: 2 additions & 2 deletions docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ The following instructions assume that you are building `application-services` f
1. Set `ANDROID_SDK_ROOT` and `ANDROID_HOME` to the Android Studio sdk location and add it to your rc file (either `.zshrc` or `.bashrc` depending on the shell you use for your terminal).
1. Configure the required versions of NDK
`Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)`
- 25.1.8937393 (required by Fenix; note: a specific NDK version isn't configured, this maps to default [NDK version](https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp) for the [AGP version](https://github.com/mozilla-mobile/firefox-android/blob/main/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt#L31))
- 26.2.11394342 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L33))
- 26.2.11394342 (required by Fenix; note: a specific NDK version isn't configured, this maps to default [NDK version](https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp) for the [AGP version](https://searchfox.org/mozilla-central/source/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt#33))
- 27.0.12077973 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L33))
1. If you are on Windows using WSL - drop to the section below, [Windows setup
for Android (WSL)](building.md#windows-setup-for-android-via-wsl) before proceeding.
1. Check dependencies, environment variables
Expand Down
2 changes: 1 addition & 1 deletion docs/howtos/locally-building-jna.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Here are the steps that worked for me:
for each target platform are in your `$PATH`. On my Mac with Android Studio the
config was as follows:
```
export NDK_ROOT="$HOME/Library/Android/sdk/ndk/26.2.11394342"
export NDK_ROOT="$HOME/Library/Android/sdk/ndk/27.0.12077973"
export NDK_PLATFORM="$NDK_ROOT/platforms/android-25"
export PATH="$PATH:$NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/bin"
export PATH="$PATH:$NDK_ROOT/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin"
Expand Down
2 changes: 1 addition & 1 deletion libs/build-nss-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if [[ "${CROSS_COMPILE_TARGET}" =~ "darwin" ]]; then
else
# From https://firefox-ci-tc.services.mozilla.com/tasks/index/app-services.cache.level-3.content.v1.nss-artifact/latest
curl -sfSL --retry 5 --retry-delay 10 -O "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/app-services.cache.level-3.content.v1.nss-artifact.latest/artifacts/public%2Fdist.tar.bz2"
SHA256="af861dbda0c03551f1cce90ca0ebc45c0a282b9b9e504189fb86d4dce4f1103f"
SHA256="675aed4045d48c0c25791a7ba8e6b3a0417eda7ce803c79ef2b044c6f4b2150c"
echo "${SHA256} dist.tar.bz2" | shasum -a 256 -c - || exit 2
tar xvjf dist.tar.bz2 && rm -rf dist.tar.bz2
NSS_DIST_DIR=$(abspath "dist")
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/docker/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ WORKDIR /builds/worker/
ENV ANDROID_BUILD_TOOLS "34.0.0"
ENV ANDROID_TOOLS_VERSION "11076708"
ENV ANDROID_PLATFORM_VERSION "34"
ENV ANDROID_NDK_VERSION "26.2.11394342"
ENV ANDROID_NDK_VERSION "27.0.12077973"

# Set up the language variables to avoid problems (we run locale-gen later).
ENV LANG en_US.UTF-8
Expand Down
6 changes: 3 additions & 3 deletions taskcluster/kinds/fetch/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ tasks:
description: fetches the built NSS artifacts from NSS CI
fetch:
type: static-url
url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/Soqz2ocqTxmbzwZ1yUuZOw/runs/0/artifacts/public/dist.tar.bz2
sha256: af861dbda0c03551f1cce90ca0ebc45c0a282b9b9e504189fb86d4dce4f1103f
size: 23660664
url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/w-rkVgqxQJij9zQdlmVduQ/runs/0/artifacts/public/dist.tar.bz2
sha256: 675aed4045d48c0c25791a7ba8e6b3a0417eda7ce803c79ef2b044c6f4b2150c
size: 23720915