Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update NDK to version 26 #48254

Merged
zanderso merged 1 commit into from
Feb 7, 2024
Merged

Update NDK to version 26 #48254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Checks: >-
-clang-analyzer-nullability.NullablePassedToNonnull,
-clang-analyzer-nullability.NullReturnedFromNonnull,
-clang-analyzer-nullability.NullableReturnedFromNonnull,
-clang-analyzer-nullability.NullableDereferenced,
Copy link
Copy Markdown
Contributor

@dnfield dnfield Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intended for this PR?

Copy link
Copy Markdown
Member Author

@zanderso zanderso Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. The sysroot for the newer API level is triggering some false-positives in a few places: https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20linux_clang_tidy/6722/overview.

performance-for-range-copy,
performance-inefficient-vector-operation,
performance-move-const-arg,
Expand Down
4 changes: 2 additions & 2 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ allowed_hosts = [
]

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

'src/flutter/third_party/rapidjson':
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
Expand Down Expand Up @@ -754,7 +754,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/all/${{platform}}',
'version': 'version:34v3'
'version': 'version:34v7'
}
],
'condition': 'download_android_deps',
Expand Down
1 change: 0 additions & 1 deletion build/secondary/third_party/vulkan_validation_layers/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,6 @@ foreach(layer_info, layers) {
}
if (is_android) {
libs = [
"c++_static", # Note: C++ added by Flutter.
Copy link
Copy Markdown
Contributor

@dnfield dnfield Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this still needed?

Copy link
Copy Markdown
Member Author

@zanderso zanderso Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't exist in the sysroot, and seems to be unnecessary when linking against the clangrt libraries instead of libgcc.

Copy link
Copy Markdown
Member Author

@zanderso zanderso Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked in flutter/flutter#142240 by trying the device lab test Aaron added: https://ci.chromium.org/ui/p/flutter/builders/try/Linux_pixel_7pro%20hello_world_impeller/2/overview.

"log",
"nativewindow",
]
Expand Down
5 changes: 3 additions & 2 deletions ci/binary_size_treemap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ if [ "$(uname)" == "Darwin" ]; then
else
NDK_PLATFORM="linux-x86_64"
fi
ADDR2LINE="third_party/android_tools/ndk/toolchains/aarch64-linux-android-4.9/prebuilt/$NDK_PLATFORM/bin/aarch64-linux-android-addr2line"
ADDR2LINE="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-addr2line"
NM="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-nm"

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