Skip to content

Commit 5d00bf8

Browse files
authored
Update Engine CI to use NDK r28c (flutter#175870)
After uploading a revision of Android 36 SDK (36v3) to CIPD, I am updating Engine CI to test against 36v3. super fun: There is a new Android header in 28rc ndk (a part of 36v3) `AHARDWAREBUFFER_FORMAT_YCbCr_P210` [here](https://cs.android.com/android/platform/superproject/main/+/main:frameworks/native/libs/nativewindow/include/android/hardware_buffer.h;l=178-183?q=libs%2Fnativewindow%2Finclude%2Fandroid%2Fhardware_buffer.h) that did not exist in the 27 ndk version (a part of 36v2). Confirmed by downloading both 36v2 and 36v3 from CIPD and checking `hardware.buffer.h`. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 96fe3b3 commit 5d00bf8

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ deps = {
612612
'packages': [
613613
{
614614
'package': 'flutter/android/sdk/all/${{platform}}',
615-
'version': 'version:36v2'
615+
'version': 'version:36v3'
616616
}
617617
],
618618
'condition': 'download_android_deps',

engine/src/build/config/compiler/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ config("runtime_library") {
651651
"m",
652652
]
653653

654-
lib_dirs += [ "${android_toolchain_root}/lib/clang/18/lib/linux/" ]
654+
lib_dirs += [ "${android_toolchain_root}/lib/clang/19/lib/linux/" ]
655655
current_android_cpu = current_cpu
656656
if (current_cpu == "arm64") {
657657
current_android_cpu = "aarch64"

engine/src/flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ PixelFormat ToPixelFormat(AHardwareBuffer_Format format) {
263263
case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
264264
case AHARDWAREBUFFER_FORMAT_D16_UNORM:
265265
case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
266+
case AHARDWAREBUFFER_FORMAT_YCbCr_P210:
266267
// Not understood by the rest of Impeller. Use a placeholder but create
267268
// the native image and image views using the right external format.
268269
break;

0 commit comments

Comments
 (0)