github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up output directory before copying over new files (#14085)

Browse Source 
* Clean up output directory before copying over new files

* Use standard clean task command
This commit is contained in:
Alexander Aprelev 2018-01-14 18:24:07 -08:00 committed by GitHub
parent 6e38b42919
commit 09a6df7461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/flutter_tools/gradle/flutter.gradle
View File

@ -255,7 +255,7 @@ class FlutterPlugin implements Plugin<Project> {
if (project.hasProperty('preview-dart-2')) { if (project.hasProperty('preview-dart-2')) {
previewDart2Value = project.property('preview-dart-2') previewDart2Value = project.property('preview-dart-2')
} }
Boolean strongModeValue = false Boolean strongModeValue = false
if (project.hasProperty('strong')) { if (project.hasProperty('strong')) {
strongModeValue = project.property('strong') strongModeValue = project.property('strong')
@ -295,7 +295,7 @@ class FlutterPlugin implements Plugin<Project> {
localEngineSrcPath this.localEngineSrcPath localEngineSrcPath this.localEngineSrcPath
targetPath target targetPath target
previewDart2 previewDart2Value previewDart2 previewDart2Value
strongMode strongModeValue strongMode strongModeValue
preferSharedLibrary preferSharedLibraryValue preferSharedLibrary preferSharedLibraryValue
sourceDir project.file(project.flutter.source) sourceDir project.file(project.flutter.source)
intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}") intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}")
@ -310,7 +310,7 @@ class FlutterPlugin implements Plugin<Project> {
localEngineSrcPath this.localEngineSrcPath localEngineSrcPath this.localEngineSrcPath
targetPath target targetPath target
previewDart2 previewDart2Value previewDart2 previewDart2Value
strongMode strongModeValue strongMode strongModeValue
preferSharedLibrary preferSharedLibraryValue preferSharedLibrary preferSharedLibraryValue
sourceDir project.file(project.flutter.source) sourceDir project.file(project.flutter.source)
intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}") intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}")
@ -321,6 +321,7 @@ class FlutterPlugin implements Plugin<Project> {
Task copyFlxTask = project.tasks.create(name: "copyFlutterAssets${variant.name.capitalize()}", type: Copy) { Task copyFlxTask = project.tasks.create(name: "copyFlutterAssets${variant.name.capitalize()}", type: Copy) {
dependsOn flutterTask dependsOn flutterTask
dependsOn variant.mergeAssets dependsOn variant.mergeAssets
dependsOn "clean${variant.mergeAssets.name.capitalize()}"
into variant.mergeAssets.outputDir into variant.mergeAssets.outputDir
with flutterTask.assets with flutterTask.assets
} }
@ -453,18 +454,20 @@ class FlutterTask extends BaseFlutterTask {
CopySpec getAssets() { CopySpec getAssets() {
return project.copySpec { return project.copySpec {
from "${intermediateDir}" from "${intermediateDir}"
include "flutter_assets/**" // the working dir and its files include "flutter_assets/**" // the working dir and its files
if (buildMode != 'debug') { if (buildMode != 'debug') {
if (preferSharedLibrary) { if (preferSharedLibrary) {
include "${intermediateDir}/app.so" include "${intermediateDir}/app.so"
} else { } else {
include "vm_snapshot_data" include "vm_snapshot_data"
include "vm_snapshot_instr" include "vm_snapshot_instr"
include "isolate_snapshot_data" include "isolate_snapshot_data"
include "isolate_snapshot_instr" include "isolate_snapshot_instr"
} }
} }
} }
} }
FileCollection readDependencies(File dependenciesFile) { FileCollection readDependencies(File dependenciesFile) {