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 version to 27.1.12297006 #40

Merged
merged 6 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion .github/workflows/android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
path: ./bazel-bin/examples/android/android_app.apk
gradle_tests:
# Requires a "larger runner", for nested virtualization support
runs-on: ubuntu-latest-8-cores
runs-on: ubuntu-latest
env:
SKIP_PROTO_GEN: 1
if: needs.pre_check.outputs.should_run == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:
cancel-in-progress: true
jobs:
format_check:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
# --- Build the project for release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_gh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# Running on ubuntu-latest builds againt a glibc that is more modern than what
# instant-android uses in CI, causing a load error. Use 20.04 to link against a compatible
# glibc.
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: ["verify-version"]
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 3 additions & 0 deletions ci/check_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

set -euo pipefail

echo "check_result=0" >> "$GITHUB_OUTPUT"
exit 0 # Changes found

# Compares the head ref and $GITHUB_BASE_REF (PR branch + target branch, usually main) to
# determine which Bazel targets have changed. This is done by analyzing the cache keys and
# should be authoritative assuming the builds are hermetic.
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Setup the environment, open Android Studio.

![](../docs/images/android_local_gradle_error.png)

- Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.0.12077973`).
- Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.1.12297006`).

![](../docs/images/android_local_gradle_ndk.png)

Expand Down
2 changes: 1 addition & 1 deletion platform/jvm/capture/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ android {
checkReleaseBuilds = true
}

ndkVersion = "27.0.12077973"
ndkVersion = "27.1.12297006"
}

// Rust cargo build toolchain
Expand Down
2 changes: 1 addition & 1 deletion tools/android_sdk_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ readonly softlink_root_dir="/tmp/bitdrift-android-sdk"
readonly softlink_unarchived_dir="$softlink_root_dir/android-sdk-$android_sdk_version-unarchived"

readonly cmdline_tools_version="6.0"
readonly ndk_version="27.0.12077973"
readonly ndk_version="27.1.12297006"
readonly install_android_cmd_line_tools=(
"$android_sdk_unarchived_dir/tools/bin/sdkmanager"
"--install"
Expand Down
Loading