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

[Gradle] Copy ICU data to flutter_shared only when building an AAR module (#26668)

Browse Source 
This is based on 9880baa396
but will support building APKs with --local-engine
This commit is contained in:
Jason Simmons 2019-01-17 16:33:14 -08:00 committed by GitHub
parent 6c07863f8d
commit f4c5e3eef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,6 +285,22 @@ class FlutterPlugin implements Plugin<Project> {
return "release"
}
/**
* Returns a Flutter Jar file path suitable for the specified Android buildMode.
*/
private File flutterJarFor(buildMode) {
if (buildMode == "profile") {
return profileFlutterJar
} else if (buildMode == "dynamicProfile") {
return dynamicProfileFlutterJar
} else if (buildMode == "dynamicRelease") {
return dynamicReleaseFlutterJar
} else if (buildMode == "debug") {
return debugFlutterJar
}
return releaseFlutterJar
}
private void addFlutterTask(Project project) {
if (project.state.failure) {
return
@ -389,13 +405,29 @@ class FlutterPlugin implements Plugin<Project> {
// We know that the flutter app is a subproject in another Android app when these tasks exist.
Task packageAssets = project.tasks.findByPath(":flutter:package${variant.name.capitalize()}Assets")
Task cleanPackageAssets = project.tasks.findByPath(":flutter:cleanPackage${variant.name.capitalize()}Assets")
Task copyFlutterAssetsTask = project.tasks.create(name: "copyFlutterAssets${variant.name.capitalize()}", type: Copy) {
dependsOn flutterTask
dependsOn packageAssets ? packageAssets : variant.mergeAssets
dependsOn cleanPackageAssets ? cleanPackageAssets : "clean${variant.mergeAssets.name.capitalize()}"
into packageAssets ? packageAssets.outputDir : variant.mergeAssets.outputDir
if (packageAssets && cleanPackageAssets) {
dependsOn packageAssets
dependsOn cleanPackageAssets
into packageAssets.outputDir
File chosenFlutterJar = flutterJarFor(flutterBuildMode)
Task copySharedFlutterAssetsTask = project.tasks.create(name: "copySharedFlutterAssets${variant.name.capitalize()}", type: Copy) {
from(project.zipTree(chosenFlutterJar))
include 'assets/flutter_shared/*'
into "src/${variant.name}"
}
dependsOn copySharedFlutterAssetsTask
} else {
dependsOn variant.mergeAssets
dependsOn "clean${variant.mergeAssets.name.capitalize()}"
into variant.mergeAssets.outputDir
}
with flutterTask.assets
}
if (packageAssets) {
// Only include configurations that exist in parent project.
Task mergeAssets = project.tasks.findByPath(":app:merge${variant.name.capitalize()}Assets")