Move `.cxx` directory out of `android/app` #166277

gmackall · 2025-03-31T18:20:17Z

This is a build artifact, so move to build/app/intermediates/flutter.

See/ fixes #160372

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.

ash2moon · 2025-03-31T19:36:40Z

dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart

+          throw TaskResult.failure('Producing unexpected build artifacts in $defaultPath');
+        }
+        if (!Directory(modifiedPath).existsSync()) {
+          throw TaskResult.failure('Not producing expected build artifacts');


Should we adjust this message to say something about the path not existing?

Changed the message to include the missing path and to be more specific

…t is missing

matanlurey

Test change LGTM.

gnprice · 2025-03-31T20:52:15Z

packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt

+        gradleProjectAndroidExtension.externalNativeBuild.cmake.buildStagingDirectory(
+            gradleProject.layout.buildDirectory
+                .dir("${FlutterPluginConstants.INTERMEDIATES_DIR}/flutter/.cxx")


Seems reasonable. Over at #160372 (comment) on the issue, you wrote:

Interestingly it looks like the AGP maintainers sort of disagree, and explicitly say not to to put the external native build output directory in your projects temporary build directory. I think it probably isn't a problem for us, though, as we aren't actually building anything anyways (we are just tricking AGP into downloading the NDK).

Did they say that anywhere that can be linked to? I'm curious also if they added anything about their thinking on why putting it in the temporary build directory is undesirable.

Yes, should have included the link but it is in
https://developer.android.com/reference/tools/gradle-api/8.3/null/com/android/build/api/dsl/Cmake#buildStagingDirectory(kotlin.Any)

If you specify a path that's a subdirectory of your project's temporary build/ directory, you get a build error. That's because files in this directory do not persist through clean builds. So, you should either keep using the default <project_dir>//.cxx/ directory or specify a path outside the temporary build directory.

Cool. If I'm reading that right, it's saying that that's a constraint which gets enforced — if you specify a directory it doesn't like by this criterion, then that's a build error. So if builds are nevertheless working with this change, then I guess there's no error to worry about.

And it sounds like the motivation is that they want these files to survive a gradle clean so that you don't sit there rebuilding them for a long time. As you said, that doesn't matter because we're not actually building anything.

Yeah I should have been clearer, I was

extrapolating the note in the AGP docs based on assumed motiviation from (you shouldn't use the specific build/ subdirectory that AGP knows about) to (you shouldn't use any build/ subdirectory)

resolving that extrapolated concern by saying we aren't building anything anyways.

Will update the comment to be clearer

gnprice

LGTM, thanks!

I'd suggest expanding the comment a bit with the reasoning you gave in the thread.

gnprice · 2025-03-31T21:05:03Z

Oh and I think the same PR can remove the .cxx entry from the template gitignore. If someone creates a project with a new Flutter that has this change, they're probably not going to later run it on an older Flutter (and I think in general we don't guarantee that that even works).

gmackall · 2025-03-31T21:46:44Z

Oh and I think the same PR can remove the .cxx entry from the template gitignore. If someone creates a project with a new Flutter that has this change, they're probably not going to later run it on an older Flutter (and I think in general we don't guarantee that that even works).

I think I lean towards not removing them from the templates as

Projects which actually configure a native build will still have the .cxx directory at android/app/ (i.e., we only move it if it is only being used for tricking AGP to download the NDK).
(pure) Android templates defaults to gitignoring this directory, so Android defaults would gitignore it in this case.

WDYT?

gnprice · 2025-03-31T22:11:52Z

That makes sense — that's a good reason to continue to include it in the template gitignore.

…#166277)

Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions) flutter/flutter@05b5e79...a0b1b32 2025-04-01 [email protected] Roll Dart SDK from b4d374ec59ec to 4e1f02bc704f (2 revisions) (flutter/flutter#166342) 2025-04-01 [email protected] Trim any text before osascript JSON response (flutter/flutter#166296) 2025-04-01 [email protected] [Gen-l10n] Add `Message.resourceId` and `locale` to all `L10nException` error messages (flutter/flutter#163654) 2025-04-01 [email protected] Add `--ignore-timeouts` flag for `flutter test` command (flutter/flutter#164437) 2025-04-01 [email protected] Update TESTOWNERS username (flutter/flutter#166191) 2025-04-01 [email protected] Roll Skia from 4b07443e6071 to 52cbb917fffd (4 revisions) (flutter/flutter#166329) 2025-04-01 [email protected] Roll Dart SDK from 6b07a09cbd2d to b4d374ec59ec (2 revisions) (flutter/flutter#166321) 2025-04-01 [email protected] [tool] Improve using project files in build targets (flutter/flutter#166211) 2025-04-01 [email protected] Rename FlRenderer to FlCompositorOpenGL (flutter/flutter#166037) 2025-04-01 [email protected] [engine, web_ui] Fix instances of library_private_types_in_public_api (flutter/flutter#166156) 2025-04-01 [email protected] Roll Dart SDK from 509faa921c95 to 6b07a09cbd2d (1 revision) (flutter/flutter#166301) 2025-04-01 [email protected] [Impeller] small cpu perf for text contents. (flutter/flutter#166199) 2025-04-01 [email protected] [android_engine_test] disable old HC mode tests. (flutter/flutter#166293) 2025-04-01 [email protected] [impeller] fixes diagonal antialiased lines (flutter/flutter#166298) 2025-04-01 [email protected] Roll Skia from 5f262bd2cbb4 to 4b07443e6071 (10 revisions) (flutter/flutter#166299) 2025-03-31 [email protected] [Impeller] Directly tessellate conics to linear path segments (flutter/flutter#166165) 2025-03-31 [email protected] [tool] Don't write the .flutter-plugins-dependencies file if it is unchanged (flutter/flutter#166164) 2025-03-31 [email protected] Move `.cxx` directory out of `android/app` (flutter/flutter#166277) 2025-03-31 [email protected] Fix typo in carousel.dart (flutter/flutter#164727) 2025-03-31 [email protected] Roll Dart SDK from c5fa06710bb6 to 509faa921c95 (1 revision) (flutter/flutter#166283) 2025-03-31 [email protected] Public nodes needing paint or layout (flutter/flutter#166148) 2025-03-31 [email protected] [Gen-l10n] Infer placeholder types on both templates and localizations (flutter/flutter#163690) 2025-03-31 [email protected] [Engine][iOS] Cancel animation when recieved `UIKeyboardWillHideNotification` with duration 0.0 (flutter/flutter#164884) 2025-03-31 [email protected] [fuchsia] Remove explicit LogSink and InspectSink routing and use dictionaries instead (flutter/flutter#162780) 2025-03-31 [email protected] Updated to latest AVD to Support Android 16 (API 36) (flutter/flutter#165926) 2025-03-31 [email protected] Feat: Add brightnessOf method for theme (flutter/flutter#163733) 2025-03-31 [email protected] Marks Linux_mokey new_gallery__crane_perf to be flaky (flutter/flutter#165964) 2025-03-31 [email protected] [ Tool ] Correctly select entrypoint target for web build from positional argument list (flutter/flutter#166260) 2025-03-31 [email protected] [Impeller] remove validation warning ignores. (flutter/flutter#166205) 2025-03-31 [email protected] [Impeller] handle shader ordering bug on macOS. (flutter/flutter#165937) 2025-03-31 [email protected] Fix CODEOWNERS for the iOS review team (flutter/flutter#166178) 2025-03-31 [email protected] Remove `<meta content="IE=Edge" http-equiv="X-UA-Compatible">` (flutter/flutter#166252) 2025-03-31 [email protected] Roll Dart SDK from b9c35e05feb5 to c5fa06710bb6 (1 revision) (flutter/flutter#166251) 2025-03-31 [email protected] Roll Skia from 418c68ea5ccb to 5f262bd2cbb4 (2 revisions) (flutter/flutter#166244) 2025-03-31 [email protected] Roll Skia from b6a3bbd1d153 to 418c68ea5ccb (1 revision) (flutter/flutter#166236) 2025-03-31 [email protected] [Impeller] fix min filter for GL external textures. (flutter/flutter#166224) 2025-03-31 [email protected] Roll Skia from 10f4cf9a817d to b6a3bbd1d153 (13 revisions) (flutter/flutter#166231) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose ...

…r#8985) Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions) flutter/flutter@05b5e79...a0b1b32 2025-04-01 [email protected] Roll Dart SDK from b4d374ec59ec to 4e1f02bc704f (2 revisions) (flutter/flutter#166342) 2025-04-01 [email protected] Trim any text before osascript JSON response (flutter/flutter#166296) 2025-04-01 [email protected] [Gen-l10n] Add `Message.resourceId` and `locale` to all `L10nException` error messages (flutter/flutter#163654) 2025-04-01 [email protected] Add `--ignore-timeouts` flag for `flutter test` command (flutter/flutter#164437) 2025-04-01 [email protected] Update TESTOWNERS username (flutter/flutter#166191) 2025-04-01 [email protected] Roll Skia from 4b07443e6071 to 52cbb917fffd (4 revisions) (flutter/flutter#166329) 2025-04-01 [email protected] Roll Dart SDK from 6b07a09cbd2d to b4d374ec59ec (2 revisions) (flutter/flutter#166321) 2025-04-01 [email protected] [tool] Improve using project files in build targets (flutter/flutter#166211) 2025-04-01 [email protected] Rename FlRenderer to FlCompositorOpenGL (flutter/flutter#166037) 2025-04-01 [email protected] [engine, web_ui] Fix instances of library_private_types_in_public_api (flutter/flutter#166156) 2025-04-01 [email protected] Roll Dart SDK from 509faa921c95 to 6b07a09cbd2d (1 revision) (flutter/flutter#166301) 2025-04-01 [email protected] [Impeller] small cpu perf for text contents. (flutter/flutter#166199) 2025-04-01 [email protected] [android_engine_test] disable old HC mode tests. (flutter/flutter#166293) 2025-04-01 [email protected] [impeller] fixes diagonal antialiased lines (flutter/flutter#166298) 2025-04-01 [email protected] Roll Skia from 5f262bd2cbb4 to 4b07443e6071 (10 revisions) (flutter/flutter#166299) 2025-03-31 [email protected] [Impeller] Directly tessellate conics to linear path segments (flutter/flutter#166165) 2025-03-31 [email protected] [tool] Don't write the .flutter-plugins-dependencies file if it is unchanged (flutter/flutter#166164) 2025-03-31 [email protected] Move `.cxx` directory out of `android/app` (flutter/flutter#166277) 2025-03-31 [email protected] Fix typo in carousel.dart (flutter/flutter#164727) 2025-03-31 [email protected] Roll Dart SDK from c5fa06710bb6 to 509faa921c95 (1 revision) (flutter/flutter#166283) 2025-03-31 [email protected] Public nodes needing paint or layout (flutter/flutter#166148) 2025-03-31 [email protected] [Gen-l10n] Infer placeholder types on both templates and localizations (flutter/flutter#163690) 2025-03-31 [email protected] [Engine][iOS] Cancel animation when recieved `UIKeyboardWillHideNotification` with duration 0.0 (flutter/flutter#164884) 2025-03-31 [email protected] [fuchsia] Remove explicit LogSink and InspectSink routing and use dictionaries instead (flutter/flutter#162780) 2025-03-31 [email protected] Updated to latest AVD to Support Android 16 (API 36) (flutter/flutter#165926) 2025-03-31 [email protected] Feat: Add brightnessOf method for theme (flutter/flutter#163733) 2025-03-31 [email protected] Marks Linux_mokey new_gallery__crane_perf to be flaky (flutter/flutter#165964) 2025-03-31 [email protected] [ Tool ] Correctly select entrypoint target for web build from positional argument list (flutter/flutter#166260) 2025-03-31 [email protected] [Impeller] remove validation warning ignores. (flutter/flutter#166205) 2025-03-31 [email protected] [Impeller] handle shader ordering bug on macOS. (flutter/flutter#165937) 2025-03-31 [email protected] Fix CODEOWNERS for the iOS review team (flutter/flutter#166178) 2025-03-31 [email protected] Remove `<meta content="IE=Edge" http-equiv="X-UA-Compatible">` (flutter/flutter#166252) 2025-03-31 [email protected] Roll Dart SDK from b9c35e05feb5 to c5fa06710bb6 (1 revision) (flutter/flutter#166251) 2025-03-31 [email protected] Roll Skia from 418c68ea5ccb to 5f262bd2cbb4 (2 revisions) (flutter/flutter#166244) 2025-03-31 [email protected] Roll Skia from b6a3bbd1d153 to 418c68ea5ccb (1 revision) (flutter/flutter#166236) 2025-03-31 [email protected] [Impeller] fix min filter for GL external textures. (flutter/flutter#166224) 2025-03-31 [email protected] Roll Skia from 10f4cf9a817d to b6a3bbd1d153 (13 revisions) (flutter/flutter#166231) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose ...

Gray Mackall added 2 commits March 31, 2025 10:42

move the dir

376b08d

write test

8cea0ad

gmackall marked this pull request as ready for review March 31, 2025 18:20

gmackall requested a review from matanlurey as a code owner March 31, 2025 18:20

github-actions bot added platform-android Android applications specifically tool Affects the "flutter" command-line tool. See also t: labels. labels Mar 31, 2025

gmackall requested review from gnprice and a team March 31, 2025 18:20

gmackall mentioned this pull request Mar 31, 2025

Exclude .cxx folders from git as part of the flutter create templates. #160372

Closed

format

b0a85f7

ash2moon reviewed Mar 31, 2025

View reviewed changes

Gray Mackall added 3 commits March 31, 2025 12:43

change message to provide the path, and to be more specific about wha…

f9ae11d

…t is missing

format

e58e062

fix mocking for forcendkdownload test

81082b8

gmackall requested a review from ash2moon March 31, 2025 19:57

matanlurey approved these changes Mar 31, 2025

View reviewed changes

gnprice reviewed Mar 31, 2025

View reviewed changes

gnprice approved these changes Mar 31, 2025

View reviewed changes

expand comment

7d78480

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

auto-submit bot added this pull request to the merge queue Mar 31, 2025

Merged via the queue into flutter:master with commit f539bb4 Mar 31, 2025
145 checks passed

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

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

Roll Flutter from 1d954f4e96bd to 70cd54c3fd13 (259 revisions) flutter/packages#8973

Closed

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

322b59f

…#166277)

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

Roll Flutter from 1d954f4e96bd to 0befaaafc952 (260 revisions) flutter/packages#8974

Closed

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

f7a9165

…#166277)

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

Roll Flutter from 1d954f4e96bd to dbef1314b186 (261 revisions) flutter/packages#8976

Closed

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

d908dc0

…#166277)

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

Roll Flutter from 1d954f4e96bd to a0b1b3253416 (262 revisions) flutter/packages#8977

Closed

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

1ea22a6

…#166277)

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

30e7900

…#166277)

This was referenced Apr 2, 2025

Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions) flutter/packages#8983

Closed

Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions) flutter/packages#8985

Merged

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

f539bb447 Move .cxx directory out of android/app (flutter/flutter…

af2f6b3

…#166277)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move `.cxx` directory out of `android/app` #166277

Move `.cxx` directory out of `android/app` #166277

gmackall commented Mar 31, 2025 •

edited

Loading

ash2moon Mar 31, 2025

gmackall Mar 31, 2025

matanlurey left a comment

gnprice Mar 31, 2025

gmackall Mar 31, 2025

gnprice Mar 31, 2025

gmackall Mar 31, 2025 •

edited

Loading

gnprice left a comment

gnprice commented Mar 31, 2025

gmackall commented Mar 31, 2025

gnprice commented Mar 31, 2025

Move .cxx directory out of android/app #166277

Move .cxx directory out of android/app #166277

Conversation

gmackall commented Mar 31, 2025 • edited Loading

Pre-launch Checklist

ash2moon Mar 31, 2025

Choose a reason for hiding this comment

gmackall Mar 31, 2025

Choose a reason for hiding this comment

matanlurey left a comment

Choose a reason for hiding this comment

gnprice Mar 31, 2025

Choose a reason for hiding this comment

gmackall Mar 31, 2025

Choose a reason for hiding this comment

gnprice Mar 31, 2025

Choose a reason for hiding this comment

gmackall Mar 31, 2025 • edited Loading

Choose a reason for hiding this comment

gnprice left a comment

Choose a reason for hiding this comment

gnprice commented Mar 31, 2025

gmackall commented Mar 31, 2025

gnprice commented Mar 31, 2025

Move `.cxx` directory out of `android/app` #166277

Move `.cxx` directory out of `android/app` #166277

gmackall commented Mar 31, 2025 •

edited

Loading

gmackall Mar 31, 2025 •

edited

Loading