[tool] Allow using archiveName in android bundle build #162390

Sameri11 · 2025-01-29T16:23:59Z

Also, for some reason, fixes #147261 , which shouldn't have been ever broken since this case tested here:

flutter/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart

Lines 153 to 173 in b007899

    
           testWithoutContext('Finds app bundle when flavor contains multiple dimensions in debug mode', () { 
        
             final FlutterProject project = generateFakeAppBundle( 
        
               'fooBarDebug', 
        
               'app-foo-bar-debug.aab', 
        
               fileSystem, 
        
             ); 
        
             final File bundle = findBundleFile( 
        
               project, 
        
               const BuildInfo( 
        
                 BuildMode.debug, 
        
                 'fooBar', 
        
                 treeShakeIcons: false, 
        
                 packageConfigPath: '.dart_tool/package_config.json', 
        
               ), 
        
               BufferLogger.test(), 
        
               fakeAnalytics, 
        
             ); 
        
             expect(bundle, isNotNull); 
        
             expect(bundle.path, '/build/app/outputs/bundle/fooBarDebug/app-foo-bar-debug.aab'); 
        
           });

Key change here is replacing the optimistic approach of guessing the filename based on buildInfo parameters with the actual discovery of built artifacts on the filesystem. This change is needed because there is no way the build can determine the archiveName from Gradle, which differentiates this part from other parameters such as buildType and flavor. Flutter build contains information about them, but not about the base name.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
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.

Sameri11 · 2025-02-25T17:32:01Z

Hey @jesswrd @gmackall ! I wanted to check if you might have some time this week to review this? Thanks!

reidbaker · 2025-02-25T17:35:26Z

If you still dont have a review next week ping me and I will get it done. sorry for the lag

gmackall

LGTM outside of tiny nit

packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart

…bundle_test.dart Co-authored-by: Gray Mackall <[email protected]>

Sameri11 · 2025-02-26T04:55:50Z

Wow, that was fast. Thanks, folks! :)

Sameri11 · 2025-02-28T13:29:42Z

Big thanks for collaboration on this! Since 2 LGTMs, could you please add autosubmit label here? :)

…er/flutter#162390)

Roll Flutter from 2e570ca to 842db35 (59 revisions) flutter/flutter@2e570ca...842db35 2025-03-02 [email protected] Roll Skia from ad64415050aa to 101eee8fce59 (1 revision) (flutter/flutter#164449) 2025-03-02 [email protected] Roll Fuchsia Linux SDK from ln3joxJfRN2XGhvCv... to AO1KirSDI7-MVYNPN... (flutter/flutter#164440) 2025-03-02 [email protected] android: Clean up gen_snapshot artifact build (flutter/flutter#164418) 2025-03-02 [email protected] Start using `bin/cache/engine.{stamp|realm}` instead of `bin/internal/engine.{realm|version}`. (flutter/flutter#164352) 2025-03-01 [email protected] Add macos/android_debug_unopt to local_engine.json (flutter/flutter#164410) 2025-03-01 [email protected] Delete unused build archive targets (flutter/flutter#164414) 2025-03-01 [email protected] Roll Fuchsia Linux SDK from QMun2itYrV_zUYrvW... to ln3joxJfRN2XGhvCv... (flutter/flutter#164423) 2025-03-01 [email protected] Roll Skia from ac14158663ea to ad64415050aa (1 revision) (flutter/flutter#164413) 2025-03-01 [email protected] Update linux_host_engine.json ci/host_release description (flutter/flutter#164402) 2025-03-01 [email protected] In update_engine_version_test.dart, do not populate the test environment with the host platform environment (flutter/flutter#164395) 2025-03-01 [email protected] Roll-forward #164317: Use `bin/cache/engine.stamp` (flutter/flutter#164401) 2025-02-28 [email protected] Make pressing and moving on CupertinoButton closer to native behavior. (flutter/flutter#161731) 2025-02-28 [email protected] Roll Skia from 4005ba3ca7b6 to ac14158663ea (7 revisions) (flutter/flutter#164404) 2025-02-28 [email protected] [macOS] Prepare FlutterKeyboardManager for multi-view (flutter/flutter#163962) 2025-02-28 [email protected] Add PlatformDispatcher.engineId (flutter/flutter#163476) 2025-02-28 [email protected] Move `integration_test.FlutterDeviceScreenshotTest` to the framework slow shard (flutter/flutter#164398) 2025-02-28 [email protected] Fix: Update DelegatedTransition animation parameter correctly (flutter/flutter#163853) 2025-02-28 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Write an identical value to `bin/cache/engine.stamp` to prepare for migration (#164317)" (flutter/flutter#164396) 2025-02-28 [email protected] Add action for configuring default action of EditableText.onTapUpOutside (flutter/flutter#162575) 2025-02-28 [email protected] Align jvmTarget usages across codebase, while editing build.gradle files align them with android version documentation (flutter/flutter#164200) 2025-02-28 [email protected] Roll Packages from 01d3d5c to 70b41e1 (5 revisions) (flutter/flutter#164380) 2025-02-28 [email protected] [tool] Allow using archiveName in android bundle build (flutter/flutter#162390) 2025-02-28 [email protected] Fix incorrectly checking for invalid environment variables in the tool (flutter/flutter#164101) 2025-02-28 [email protected] Support forward and back buttons (flutter/flutter#164356) 2025-02-28 [email protected] Fix window creation callback for multi-window (flutter/flutter#164353) 2025-02-28 [email protected] Fix flutter doctor usage of eglinfo in failure cases. (flutter/flutter#164334) 2025-02-28 [email protected] Refactor writing of package config in tests (flutter/flutter#163734) 2025-02-28 [email protected] Fixed the issue that Slider's secondaryTrackValue is not updated. (flutter/flutter#163996) 2025-02-28 [email protected] Roll pub packages (flutter/flutter#164357) 2025-02-28 [email protected] Remove `Mac mac_unopt` presubmit retry count (flutter/flutter#164350) 2025-02-28 [email protected] Roll Fuchsia Linux SDK from 1elkOxihZuTEiTXzY... to QMun2itYrV_zUYrvW... (flutter/flutter#164351) 2025-02-28 [email protected] Drag handles only need to be tested on mobile platforms. (flutter/flutter#163723) 2025-02-28 [email protected] [Android] Use java for looking up Android API level. (flutter/flutter#163558) 2025-02-28 [email protected] Write an identical value to `bin/cache/engine.stamp` to prepare for migration (flutter/flutter#164317) 2025-02-27 [email protected] Wires up expanded state in web engine (flutter/flutter#164048) 2025-02-27 [email protected] Remove Cheserton's File (flutter/flutter#164340) 2025-02-27 [email protected] Replace update semantics handler with signal. (flutter/flutter#163583) 2025-02-27 [email protected] Split up the conical gradient fragment shader (flutter/flutter#164058) 2025-02-27 [email protected] Roll Skia from c16b145749d4 to 4005ba3ca7b6 (3 revisions) (flutter/flutter#164339) 2025-02-27 [email protected] Delete and update stale documentation regarding engine/engine hash. (flutter/flutter#164324) 2025-02-27 [email protected] Document how `engine.version` (is/will be) computed (flutter/flutter#164335) 2025-02-27 [email protected] Update conductor to write engine.version file (flutter/flutter#163350) 2025-02-27 [email protected] remove last usages of min/compile/target SdkVersion, align sourceCompatibility across repo and update android version documentation (flutter/flutter#164198) 2025-02-27 [email protected] Update links to the `flutter/engine` repository for the monorepo. (flutter/flutter#164328) 2025-02-27 [email protected] Add empty `io.flutter.app.FlutterApplication` to give deprecation notice, and un-break projects that have not migrated (flutter/flutter#164233) 2025-02-27 [email protected] Revert dart sdks that were causing dartaotruntime issues in g3 (flutter/flutter#164307) ...

…er/flutter#162390)

Roll Flutter from 2e570ca to 842db35 (59 revisions) flutter/flutter@2e570ca...842db35 2025-03-02 [email protected] Roll Skia from ad64415050aa to 101eee8fce59 (1 revision) (flutter/flutter#164449) 2025-03-02 [email protected] Roll Fuchsia Linux SDK from ln3joxJfRN2XGhvCv... to AO1KirSDI7-MVYNPN... (flutter/flutter#164440) 2025-03-02 [email protected] android: Clean up gen_snapshot artifact build (flutter/flutter#164418) 2025-03-02 [email protected] Start using `bin/cache/engine.{stamp|realm}` instead of `bin/internal/engine.{realm|version}`. (flutter/flutter#164352) 2025-03-01 [email protected] Add macos/android_debug_unopt to local_engine.json (flutter/flutter#164410) 2025-03-01 [email protected] Delete unused build archive targets (flutter/flutter#164414) 2025-03-01 [email protected] Roll Fuchsia Linux SDK from QMun2itYrV_zUYrvW... to ln3joxJfRN2XGhvCv... (flutter/flutter#164423) 2025-03-01 [email protected] Roll Skia from ac14158663ea to ad64415050aa (1 revision) (flutter/flutter#164413) 2025-03-01 [email protected] Update linux_host_engine.json ci/host_release description (flutter/flutter#164402) 2025-03-01 [email protected] In update_engine_version_test.dart, do not populate the test environment with the host platform environment (flutter/flutter#164395) 2025-03-01 [email protected] Roll-forward #164317: Use `bin/cache/engine.stamp` (flutter/flutter#164401) 2025-02-28 [email protected] Make pressing and moving on CupertinoButton closer to native behavior. (flutter/flutter#161731) 2025-02-28 [email protected] Roll Skia from 4005ba3ca7b6 to ac14158663ea (7 revisions) (flutter/flutter#164404) 2025-02-28 [email protected] [macOS] Prepare FlutterKeyboardManager for multi-view (flutter/flutter#163962) 2025-02-28 [email protected] Add PlatformDispatcher.engineId (flutter/flutter#163476) 2025-02-28 [email protected] Move `integration_test.FlutterDeviceScreenshotTest` to the framework slow shard (flutter/flutter#164398) 2025-02-28 [email protected] Fix: Update DelegatedTransition animation parameter correctly (flutter/flutter#163853) 2025-02-28 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Write an identical value to `bin/cache/engine.stamp` to prepare for migration (#164317)" (flutter/flutter#164396) 2025-02-28 [email protected] Add action for configuring default action of EditableText.onTapUpOutside (flutter/flutter#162575) 2025-02-28 [email protected] Align jvmTarget usages across codebase, while editing build.gradle files align them with android version documentation (flutter/flutter#164200) 2025-02-28 [email protected] Roll Packages from 01d3d5c to 70b41e1 (5 revisions) (flutter/flutter#164380) 2025-02-28 [email protected] [tool] Allow using archiveName in android bundle build (flutter/flutter#162390) 2025-02-28 [email protected] Fix incorrectly checking for invalid environment variables in the tool (flutter/flutter#164101) 2025-02-28 [email protected] Support forward and back buttons (flutter/flutter#164356) 2025-02-28 [email protected] Fix window creation callback for multi-window (flutter/flutter#164353) 2025-02-28 [email protected] Fix flutter doctor usage of eglinfo in failure cases. (flutter/flutter#164334) 2025-02-28 [email protected] Refactor writing of package config in tests (flutter/flutter#163734) 2025-02-28 [email protected] Fixed the issue that Slider's secondaryTrackValue is not updated. (flutter/flutter#163996) 2025-02-28 [email protected] Roll pub packages (flutter/flutter#164357) 2025-02-28 [email protected] Remove `Mac mac_unopt` presubmit retry count (flutter/flutter#164350) 2025-02-28 [email protected] Roll Fuchsia Linux SDK from 1elkOxihZuTEiTXzY... to QMun2itYrV_zUYrvW... (flutter/flutter#164351) 2025-02-28 [email protected] Drag handles only need to be tested on mobile platforms. (flutter/flutter#163723) 2025-02-28 [email protected] [Android] Use java for looking up Android API level. (flutter/flutter#163558) 2025-02-28 [email protected] Write an identical value to `bin/cache/engine.stamp` to prepare for migration (flutter/flutter#164317) 2025-02-27 [email protected] Wires up expanded state in web engine (flutter/flutter#164048) 2025-02-27 [email protected] Remove Cheserton's File (flutter/flutter#164340) 2025-02-27 [email protected] Replace update semantics handler with signal. (flutter/flutter#163583) 2025-02-27 [email protected] Split up the conical gradient fragment shader (flutter/flutter#164058) 2025-02-27 [email protected] Roll Skia from c16b145749d4 to 4005ba3ca7b6 (3 revisions) (flutter/flutter#164339) 2025-02-27 [email protected] Delete and update stale documentation regarding engine/engine hash. (flutter/flutter#164324) 2025-02-27 [email protected] Document how `engine.version` (is/will be) computed (flutter/flutter#164335) 2025-02-27 [email protected] Update conductor to write engine.version file (flutter/flutter#163350) 2025-02-27 [email protected] remove last usages of min/compile/target SdkVersion, align sourceCompatibility across repo and update android version documentation (flutter/flutter#164198) 2025-02-27 [email protected] Update links to the `flutter/engine` repository for the monorepo. (flutter/flutter#164328) 2025-02-27 [email protected] Add empty `io.flutter.app.FlutterApplication` to give deprecation notice, and un-break projects that have not migrated (flutter/flutter#164233) 2025-02-27 [email protected] Revert dart sdks that were causing dartaotruntime issues in g3 (flutter/flutter#164307) ...

Allow using archiveName in android bundle build

1ba0803

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jan 29, 2025

Sameri11 marked this pull request as ready for review January 29, 2025 17:16

bkonyi requested a review from a team January 30, 2025 21:22

reidbaker requested review from gmackall and jesswrd February 12, 2025 16:42

gmackall approved these changes Feb 25, 2025

View reviewed changes

packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart Outdated Show resolved Hide resolved

reidbaker and others added 2 commits February 25, 2025 13:16

Update packages/flutter_tools/test/general.shard/android/gradle_find_…

90bae1c

…bundle_test.dart Co-authored-by: Gray Mackall <[email protected]>

Merge branch 'master' into android-bundle-archivename-non-standart

32f2e8a

jesswrd approved these changes Feb 26, 2025

View reviewed changes

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 28, 2025

auto-submit bot added this pull request to the merge queue Feb 28, 2025

Merged via the queue into flutter:master with commit b8902e6 Feb 28, 2025
139 of 140 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 28, 2025

engine-flutter-autoroll mentioned this pull request Feb 28, 2025

Roll Flutter from 2e570ca393c8 to b8902e6a1746 (38 revisions) flutter/packages#8759

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 28, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

62036a5

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Feb 28, 2025

Roll Flutter from 2e570ca393c8 to 787adc75ed35 (39 revisions) flutter/packages#8762

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 28, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

fc429ec

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Feb 28, 2025

Roll Flutter from 2e570ca393c8 to 845c7779b802 (40 revisions) flutter/packages#8763

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 28, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

109df9d

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Mar 1, 2025

Roll Flutter from 2e570ca393c8 to 0c055f2c508a (55 revisions) flutter/packages#8767

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 1, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

9c890ae

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Mar 1, 2025

Roll Flutter from 2e570ca393c8 to 0c055f2c508a (55 revisions) flutter/packages#8768

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 1, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

23c81bd

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Mar 2, 2025

Roll Flutter from 2e570ca393c8 to 619d4248114d (58 revisions) flutter/packages#8769

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 2, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

cd0f5f1

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Mar 2, 2025

Roll Flutter from 2e570ca393c8 to 842db35d27b8 (59 revisions) flutter/packages#8770

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 2, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

655291b

…er/flutter#162390)

engine-flutter-autoroll mentioned this pull request Mar 2, 2025

Roll Flutter from 2e570ca393c8 to 842db35d27b8 (59 revisions) flutter/packages#8771

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 2, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

805b39b

…er/flutter#162390)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

48df243

…er/flutter#162390)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

d37508f

…er/flutter#162390)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 21, 2025

b8902e6 [tool] Allow using archiveName in android bundle build (flutt…

63c9775

…er/flutter#162390)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[tool] Allow using archiveName in android bundle build #162390

[tool] Allow using archiveName in android bundle build #162390

Uh oh!

Sameri11 commented Jan 29, 2025 •

edited

Loading

Uh oh!

Sameri11 commented Feb 25, 2025

Uh oh!

reidbaker commented Feb 25, 2025 •

edited

Loading

Uh oh!

gmackall left a comment

Uh oh!

Uh oh!

Sameri11 commented Feb 26, 2025

Uh oh!

Sameri11 commented Feb 28, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	testWithoutContext('Finds app bundle when flavor contains multiple dimensions in debug mode', () {
	final FlutterProject project = generateFakeAppBundle(
	'fooBarDebug',
	'app-foo-bar-debug.aab',
	fileSystem,
	);
	final File bundle = findBundleFile(
	project,
	const BuildInfo(
	BuildMode.debug,
	'fooBar',
	treeShakeIcons: false,
	packageConfigPath: '.dart_tool/package_config.json',
	),
	BufferLogger.test(),
	fakeAnalytics,
	);

	expect(bundle, isNotNull);
	expect(bundle.path, '/build/app/outputs/bundle/fooBarDebug/app-foo-bar-debug.aab');
	});

[tool] Allow using archiveName in android bundle build #162390

[tool] Allow using archiveName in android bundle build #162390

Uh oh!

Conversation

Sameri11 commented Jan 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Sameri11 commented Feb 25, 2025

Uh oh!

reidbaker commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Sameri11 commented Feb 26, 2025

Uh oh!

Sameri11 commented Feb 28, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sameri11 commented Jan 29, 2025 •

edited

Loading

reidbaker commented Feb 25, 2025 •

edited

Loading