Skip to content

Clean up output directory before copying over new files#14085

Merged
aam merged 2 commits intoflutter:masterfrom
aam:cleanup-build-before-copying-android
Jan 15, 2018
Merged

Clean up output directory before copying over new files#14085
aam merged 2 commits intoflutter:masterfrom
aam:cleanup-build-before-copying-android

Conversation

@aam
Copy link
Member

@aam aam commented Jan 12, 2018

Clean up of whitespaces aside, this deletes output directory before copying new build artifacts over.

This complements #14081 that does the same thing on ios, which is needed to prevent incompatible(--preview-dart-2 vs non-preview-dart-2) build artifacts being included into the built app.

This fixes #13878.

@cbracken
Copy link
Member

I'm not a Gradle expert, but if this does what it purports to do, LGTM.

/cc @mravn-google and @szakarias who are the Gradle experts.

Copy link
Contributor

@mravn-google mravn-google left a comment

Choose a reason for hiding this comment

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

LGTM


Task deleteOutputDir = project.tasks.create(name: "deleteOutputDirectory${variant.name.capitalize()}", type:Delete) {
delete variant.mergeAssets.outputDir
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe there is a cleanXxx task for every output-producing task xxx, so this should not be necessary. See below.

Copy link
Member Author

Choose a reason for hiding this comment

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

Cool, good to know.

Task copyFlxTask = project.tasks.create(name: "copyFlutterAssets${variant.name.capitalize()}", type: Copy) {
dependsOn flutterTask
dependsOn variant.mergeAssets
dependsOn deleteOutputDir
Copy link
Contributor

Choose a reason for hiding this comment

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

You should be able to replace this line with

            dependsOn "clean${variant.mergeAssets.name.capitalize()}"

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@aam aam merged commit 09a6df7 into flutter:master Jan 15, 2018
@aam aam deleted the cleanup-build-before-copying-android branch January 15, 2018 02:24
DaveShuckerow pushed a commit to DaveShuckerow/flutter that referenced this pull request May 14, 2018
* Clean up output directory before copying over new files

* Use standard clean task command
engine-flutter-autoroll added a commit that referenced this pull request Dec 4, 2019
[email protected]:flutter/engine.git/compare/1a96087747ac...6179380

git log 1a96087..6179380 --first-parent --oneline
2019-12-03 [email protected] Update fallback to Roboto url to be HTTPS (#14086)
2019-12-03 [email protected] Revert "Fix fml_unittests (#14062)" (#14087)
2019-12-03 [email protected] Revert PRs to unblock David and Jim's work (#14088)
2019-12-03 [email protected] Roll fuchsia/sdk/core/mac-amd64 from 6QxEZ... to OSk8h... (#14085)
2019-12-03 [email protected] Roll src/third_party/dart e4344a568f..a4d799c402 (7 commits) (#14083)


If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected] on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

4 participants