Skip to content

Commit fafd8e5

Browse files
authored
Update NDK to version 26 (flutter#48254)
This PR adjusts the GN build for a newer Android NDK. It relies on flutter/buildroot#822.
1 parent 6807342 commit fafd8e5

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Checks: >-
2222
-clang-analyzer-nullability.NullablePassedToNonnull,
2323
-clang-analyzer-nullability.NullReturnedFromNonnull,
2424
-clang-analyzer-nullability.NullableReturnedFromNonnull,
25+
-clang-analyzer-nullability.NullableDereferenced,
2526
performance-for-range-copy,
2627
performance-inefficient-vector-operation,
2728
performance-move-const-arg,

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ allowed_hosts = [
274274
]
275275

276276
deps = {
277-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '52689fe8955a9a4916a38f0b8ae5ea3e217037f4',
277+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '71c9a9987171ef3f8b60a9e0b346bce30ee65933',
278278

279279
'src/flutter/third_party/rapidjson':
280280
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
@@ -754,7 +754,7 @@ deps = {
754754
'packages': [
755755
{
756756
'package': 'flutter/android/sdk/all/${{platform}}',
757-
'version': 'version:34v3'
757+
'version': 'version:34v7'
758758
}
759759
],
760760
'condition': 'download_android_deps',

build/secondary/third_party/vulkan_validation_layers/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,6 @@ foreach(layer_info, layers) {
464464
}
465465
if (is_android) {
466466
libs = [
467-
"c++_static", # Note: C++ added by Flutter.
468467
"log",
469468
"nativewindow",
470469
]

ci/binary_size_treemap.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ if [ "$(uname)" == "Darwin" ]; then
2222
else
2323
NDK_PLATFORM="linux-x86_64"
2424
fi
25-
ADDR2LINE="third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/$NDK_PLATFORM/bin/aarch64-linux-android-addr2line"
25+
ADDR2LINE="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-addr2line"
26+
NM="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-nm"
2627

2728
# Run the binary size script from the buildroot directory so the treemap path
2829
# navigation will start from there.
2930
cd "$ENGINE_BUILDROOT"
3031
RUN_BINARY_SIZE_ANALYSIS="third_party/dart/third_party/binary_size/src/run_binary_size_analysis.py"
31-
python3 "$RUN_BINARY_SIZE_ANALYSIS" --library "$INPUT_PATH" --destdir "$DEST_DIR" --addr2line-binary "$ADDR2LINE"
32+
python3 "$RUN_BINARY_SIZE_ANALYSIS" --library "$INPUT_PATH" --destdir "$DEST_DIR" --addr2line-binary "$ADDR2LINE" --nm-binary "$NM" --jobs 1 --no-check-support

0 commit comments

Comments
 (0)