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

Updates for Android NDK version 26 #822

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

zanderso
Copy link
Member

@zanderso zanderso commented Jan 30, 2024

This PR adjusts the buildroot for Android NDK version 26. This NDK version only supports clang, so it contains some cleanups of old non-clang pathways.

The companion flutter/engine PR is flutter/engine#48254.

Copy link
Contributor

@reidbaker reidbaker left a comment

Choose a reason for hiding this comment

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

RSLGTM.

Comment on lines 97 to 99
if (current_cpu != "x64" && current_cpu != "arm64") {
android_api_level = 19
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs to stay and get changed to 21. The default above is 22.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch.

@@ -25,22 +16,6 @@ if (is_android) {
android_sdk_version = default_android_sdk_version
android_sdk_build_tools_version = default_android_sdk_build_tools_version

android_default_keystore_path =
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: if you're removing these, maybe remove them from the declare_args block above too?

Copy link
Member Author

Choose a reason for hiding this comment

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

Could you clarify? These deletions are the deletions from the declare_args block.

Copy link
Contributor

@dnfield dnfield left a comment

Choose a reason for hiding this comment

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

LGTM

@zanderso zanderso merged commit 71c9a99 into flutter:master Feb 5, 2024
1 check passed
@zanderso zanderso deleted the android-ndk-26 branch February 5, 2024 22:45
zanderso added a commit to flutter/engine that referenced this pull request Feb 7, 2024
This PR adjusts the GN build for a newer Android NDK. It relies on
flutter/buildroot#822.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants