This commit is contained in:
Ryan VanderMeulen 2024-10-24 14:21:14 -04:00
Родитель 3d79da3263
Коммит d160a87f30
6 изменённых файлов: 9 добавлений и 6 удалений

Просмотреть файл

@ -8,6 +8,9 @@
## 🦊 What's Changed 🦊 ## 🦊 What's Changed 🦊
### Android
- Upgraded NDK from r27 to r27c. ([#6432](https://github.com/mozilla/application-services/pull/6432))
### Glean ### Glean
- Updated to v61.2.0 ([#6410](https://github.com/mozilla/application-services/pull/6410)) - Updated to v61.2.0 ([#6410](https://github.com/mozilla/application-services/pull/6410))

Просмотреть файл

@ -2,7 +2,7 @@
buildscript { buildscript {
ext.build = [ ext.build = [
ndkVersion: "27.0.12077973", // Keep it in sync in TC Dockerfile. ndkVersion: "27.2.12479018", // Keep it in sync in TC Dockerfile.
// In general, we should aim to keep these in sync with AC // In general, we should aim to keep these in sync with AC
compileSdkVersion: 34, compileSdkVersion: 34,

Просмотреть файл

@ -92,7 +92,7 @@ fn link_nss_libs(kind: LinkingKind) {
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap(); let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
if target_arch == "x86_64" && target_os == "android" { if target_arch == "x86_64" && target_os == "android" {
let android_home = env::var("ANDROID_HOME").expect("ANDROID_HOME not set"); let android_home = env::var("ANDROID_HOME").expect("ANDROID_HOME not set");
const ANDROID_NDK_VERSION: &str = "27.0.12077973"; const ANDROID_NDK_VERSION: &str = "27.2.12479018";
// One of these will exist, depending on the host platform. // One of these will exist, depending on the host platform.
const DARWIN_X86_64_LIB_DIR: &str = const DARWIN_X86_64_LIB_DIR: &str =
"/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/"; "/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18/lib/linux/";

Просмотреть файл

@ -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. 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 1. Configure the required versions of NDK
`Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)` `Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)`
- 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 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)) - 27.2.12479018 (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 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. for Android (WSL)](building.md#windows-setup-for-android-via-wsl) before proceeding.
1. Check dependencies, environment variables 1. Check dependencies, environment variables

Просмотреть файл

@ -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 for each target platform are in your `$PATH`. On my Mac with Android Studio the
config was as follows: config was as follows:
``` ```
export NDK_ROOT="$HOME/Library/Android/sdk/ndk/27.0.12077973" export NDK_ROOT="$HOME/Library/Android/sdk/ndk/27.2.12479018"
export NDK_PLATFORM="$NDK_ROOT/platforms/android-25" 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/llvm/prebuilt/darwin-x86_64/bin"
export PATH="$PATH:$NDK_ROOT/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin" export PATH="$PATH:$NDK_ROOT/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin"

Просмотреть файл

@ -22,7 +22,7 @@ WORKDIR /builds/worker/
ENV ANDROID_BUILD_TOOLS "35.0.0" ENV ANDROID_BUILD_TOOLS "35.0.0"
ENV ANDROID_TOOLS_VERSION "11076708" ENV ANDROID_TOOLS_VERSION "11076708"
ENV ANDROID_PLATFORM_VERSION "35" ENV ANDROID_PLATFORM_VERSION "35"
ENV ANDROID_NDK_VERSION "27.0.12077973" ENV ANDROID_NDK_VERSION "27.2.12479018"
# Set up the language variables to avoid problems (we run locale-gen later). # Set up the language variables to avoid problems (we run locale-gen later).
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8