This commit is contained in:
Ben Dean-Kawamura 2023-03-24 11:47:36 -04:00
Родитель 6fa406f804
Коммит eac793d16a
5 изменённых файлов: 5 добавлений и 5 удалений

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

@ -23,4 +23,4 @@ Use the template below to make assigning a version number during the release cut
### What's Changed
- Android: Upgraded NDK from r21d to r25b.
- Android: Upgraded NDK from r21d to r25c.

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

@ -29,7 +29,7 @@ buildscript {
}
ext.build = [
ndkVersion: "25.1.8937393", // Keep it in sync in TC Dockerfile.
ndkVersion: "25.2.9519653", // Keep it in sync in TC Dockerfile.
compileSdkVersion: 33,
targetSdkVersion: 33,
minSdkVersion: 21, // So that we can publish for aarch64.

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

@ -99,7 +99,7 @@ The following instructions assume that you are building `application-services` f
1. Configure the required versions of NDK
`Configure menu > System Settings > Android SDK > SDK Tools > NDK > Show Package Details > NDK (Side by side)`
- 21.4.7075529 (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/fenix/blob/main/buildSrc/src/main/java/Dependencies.kt#L11))
- 25.1.8937393 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L30))
- 25.2.9519653 (required by Application Services, [as configured](https://github.com/mozilla/application-services/blob/main/build.gradle#L30))
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

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

@ -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/25.1.8937393"
export NDK_ROOT="$HOME/Library/Android/sdk/ndk/25.2.9519653"
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"

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

@ -21,7 +21,7 @@ WORKDIR /builds/worker/
ENV ANDROID_BUILD_TOOLS "33.0.2"
ENV ANDROID_TOOLS_VERSION "9477386"
ENV ANDROID_PLATFORM_VERSION "33"
ENV ANDROID_NDK_VERSION "25.1.8937393"
ENV ANDROID_NDK_VERSION "25.2.9519653"
# Set up the language variables to avoid problems (we run locale-gen later).
ENV LANG en_US.UTF-8