Relands https://github.com/flutter/flutter/pull/162464 Fixes https://github.com/flutter/flutter/issues/170664 The only test that failed last time was `Linux_pixel_7pro android_obfuscate_test`, and I ran it locally (`flutter test test/integration.shard/android_obfuscate_test.dart `) to both repro the failure and verify it passes on this branch with the additional changes. Also does some stuff in the FGP: The reason we failed the tests last time was we were bundling of the libapp.so code into a jar in the aar case, instead of simply including it as its own file in the source sets. I let gemini go on that part, modifying it to no longer pack as a jar, but it looks correct to me. Now that the `libapp.so` file is simply included in this case, AGP is able to strip it (it's not hidden inside a jar). Because this changes the FGP build process for add to app, I manually verified that the add to app flow isn't broken for including a flutter module both as source and as an aar. <details> <summary>Before and after logs from the gradle task output</summary> Before: ``` > Task :flutter:stripReleaseDebugSymbols NO-SOURCE Skipping task ':flutter:stripReleaseDebugSymbols' as it has no source files and no previous output files. ``` After: ``` Task ':flutter:stripReleaseDebugSymbols' is not up-to-date because: No history is available. The input changes require a full rebuild for incremental task ':flutter:stripReleaseDebugSymbols'. C/C++: android.ndkVersion from module build.gradle is [28.2.13676358] C/C++: android.ndkVersion from module build.gradle is [28.2.13676358] C/C++: android.ndkPath from module build.gradle is not set C/C++: android.ndkPath from module build.gradle is not set C/C++: ndk.dir in local.properties is not set C/C++: ndk.dir in local.properties is not set C/C++: Not considering ANDROID_NDK_HOME because support was removed after deprecation period. C/C++: Not considering ANDROID_NDK_HOME because support was removed after deprecation period. C/C++: android.ndkVersion from module build.gradle is [28.2.13676358] C/C++: android.ndkPath from module build.gradle is not set C/C++: sdkFolder is /Users/mackall/Library/Android/sdk C/C++: ndk.dir in local.properties is not set C/C++: Not considering ANDROID_NDK_HOME because support was removed after deprecation period. C/C++: sdkFolder is /Users/mackall/Library/Android/sdk C/C++: sdkFolder is /Users/mackall/Library/Android/sdk Starting process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip''. Working directory: /Users/mackall/development/BugTesting/mblahm/.android/Flutter Command: /Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip --strip-unneeded -o /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/armeabi-v7a/libapp.so /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/armeabi-v7a/libapp.so Starting process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip''. Working directory: /Users/mackall/development/BugTesting/mblahm/.android/Flutter Command: /Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip --strip-unneeded -o /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/x86_64/libapp.so /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/x86_64/libapp.so Starting process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip''. Working directory: /Users/mackall/development/BugTesting/mblahm/.android/Flutter Command: /Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip --strip-unneeded -o /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/arm64-v8a/libapp.so /Users/mackall/development/BugTesting/mblahm/.android/Flutter/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/arm64-v8a/libapp.so Successfully started process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip'' Successfully started process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip'' Successfully started process 'command '/Users/mackall/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip'' ``` </details> ## 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. - [x] 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 --------- Co-authored-by: Gray Mackall <mackall@google.com>
Flutter Tools for Android
This section of the Flutter repository contains the command line developer tools for building Flutter applications on Android. What follows are some notes about updating this part of the tool.
Updating Android dependencies
The Android dependencies that Flutter uses to run on Android include the Android NDK and SDK versions, Gradle, the Kotlin Gradle Plugin, and the Android Gradle Plugin (AGP). The template versions of these dependencies can be found in gradle_utils.dart.
Follow the guides below when*...
Updating the template version of...
The Android SDK & NDK
All of the Android SDK/NDK versions noted in gradle_utils.dart
(compileSdkVersion, minSdkVersion, targetSdkVersion, ndkVersion)
versions should match the values in Flutter Gradle Plugin (FlutterExtension),
so updating any of these versions also requires an update in
FlutterExtension.
When updating the Android compileSdkVersion, minSdkVersion, or
targetSdkVersion, make sure that:
- Framework integration & benchmark tests are running with at least that SDK version.
- Flutter tools tests that perform String checks with the current template SDK versions are updated (you should see these fail if you do not fix them preemptively).
Also, make sure to also update to the same version in the following places:
- The versions for error/warn in
packages/flutter_tools/gradle/src/main/kotlin/DependencyVersionChecker.kt. - The version in the dependencies block in
packages/flutter_tools/gradle/build.gradle.kts. - The flutter min version in
engine/src/flutter/shell/platform/android/io/flutter/Build.java - The versions used when engine testing in
engine/src/flutter/shell/platform/android/test_runner/build.gradle - The versions used when working in engine/shell in
engine/src/flutter/shell/platform/android/build.gradle
Gradle
When updating the Gradle version used in project templates
(templateDefaultGradleVersion), make sure that:
- Framework integration & benchmark tests are running with at least this Gradle version.
- Flutter tools tests that perform String checks with the current template Gradle version are updated (you should see these fail if you do not fix them preemptively).
The Kotlin Gradle Plugin
When updating the Kotlin Gradle Plugin (KGP) version used in project templates
(templateKotlinGradlePluginVersion), make sure that the framework integration
& benchmark tests are running with at least this KGP version.
When updating the warnKGPVersion or errorKGPVersion ensure that versions used in
dev/tools/bin/generate_gradle_lockfiles.dart are updated if needed then regenerate
build.gradle(.kts) files.
For information about the latest version, check https://kotlinlang.org/docs/releases.html#release-details.
The Android Gradle Plugin (AGP)
When updating the Android Gradle Plugin (AGP) versions used in project templates
(templateAndroidGradlePluginVersion, templateAndroidGradlePluginVersionForModule),
make sure that:
- Framework integration & benchmark tests are running with at least this AGP version.
- Flutter tools tests that perform String checks with the current template AGP versions are updated (you should see these fail if you do not fix them preemptively).
A new version becomes available for...
Gradle
When new versions of Gradle become available, make sure to:
- Check if the maximum version of Gradle that we support
(
maxKnownAndSupportedGradleVersion) can be updated, and if so, take the necessary steps to ensure we are testing this version in CI. - Check that the Java version that is one higher than we currently support
(
oneMajorVersionHigherJavaVersion) based on current maximum supported Gradle version is up-to-date. - Update the
_javaGradleCompatListthat contains the Java/Gradle compatibility information known to the tool. - Update the test cases in gradle_utils_test.dart that test compatibility between Java and Gradle versions (relevant tests should fail if you do not fix them preemptively, but should also be marked inline).
- Update the test cases in create_test.dart that test for a warning for Java/Gradle incompatibilities as needed (relevant tests should fail if you do not fix them preemptively).
For more information about the latest version, check https://gradle.org/releases/.
The Android Gradle Plugin (AGP)
When new versions of the Android Gradle Plugin become available, make sure to:
- Update the maximum version of AGP that we know of (
maxKnownAgpVersion). - Check if the maximum version of AGP that we support
(
maxKnownAndSupportedAgpVersion) can be updated, and if so, take the necessary steps to ensure that we are testing this version in CI. - Update the
_javaAgpCompatListthat contains the Java/AGP compatibility information known to the tool. - Update the test cases in gradle_utils_test.dart that test compatibility between Java and AGP versions (relevant tests should fail if you do not fix them preemptively, but should also be marked inline).
- Update the test cases in create_test.dart that test for a warning for Java/AGP incompatibilities as needed (relevant tests should fail if you do not fix them preemptively).
For information about the latest version, check https://developer.android.com/studio/releases/gradle-plugin#updating-gradle.
* There is an ongoing effort to reduce these steps; see https://github.com/flutter/flutter/issues/134780.