Unverified Commit 427fcebc authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Remove the flutter_shared assets directory from the Gradle script (#27572)

flutter_shared was used to package the icudtl.dat file, but that data is
now embedded inside libflutter.so
parent 802eca29
...@@ -285,22 +285,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -285,22 +285,6 @@ class FlutterPlugin implements Plugin<Project> {
return "release" 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) { private void addFlutterTask(Project project) {
if (project.state.failure) { if (project.state.failure) {
return return
...@@ -412,14 +396,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -412,14 +396,6 @@ class FlutterPlugin implements Plugin<Project> {
dependsOn packageAssets dependsOn packageAssets
dependsOn cleanPackageAssets dependsOn cleanPackageAssets
into packageAssets.outputDir 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 { } else {
dependsOn variant.mergeAssets dependsOn variant.mergeAssets
dependsOn "clean${variant.mergeAssets.name.capitalize()}" dependsOn "clean${variant.mergeAssets.name.capitalize()}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment