Unverified Commit c19f7886 authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Remove portions of the Gradle script related to dynamic patching (#34606)

parent 3703e887
...@@ -135,18 +135,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -135,18 +135,6 @@ class FlutterPlugin implements Plugin<Project> {
matchingFallbacks = ['debug', 'release'] matchingFallbacks = ['debug', 'release']
} }
} }
dynamicProfile {
initWith debug
if (it.hasProperty('matchingFallbacks')) {
matchingFallbacks = ['debug', 'release']
}
}
dynamicRelease {
initWith debug
if (it.hasProperty('matchingFallbacks')) {
matchingFallbacks = ['debug', 'release']
}
}
} }
String flutterRootPath = resolveProperty(project, "flutter.sdk", System.env.FLUTTER_ROOT) String flutterRootPath = resolveProperty(project, "flutter.sdk", System.env.FLUTTER_ROOT)
...@@ -211,8 +199,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -211,8 +199,6 @@ class FlutterPlugin implements Plugin<Project> {
} }
baseJar["profile"] = baseEnginePath.resolve("${basePlatformArch}-profile").resolve("flutter.jar").toFile() baseJar["profile"] = baseEnginePath.resolve("${basePlatformArch}-profile").resolve("flutter.jar").toFile()
baseJar["release"] = baseEnginePath.resolve("${basePlatformArch}-release").resolve("flutter.jar").toFile() baseJar["release"] = baseEnginePath.resolve("${basePlatformArch}-release").resolve("flutter.jar").toFile()
baseJar["dynamicProfile"] = baseEnginePath.resolve("${basePlatformArch}-dynamic-profile").resolve("flutter.jar").toFile()
baseJar["dynamicRelease"] = baseEnginePath.resolve("${basePlatformArch}-dynamic-release").resolve("flutter.jar").toFile()
// Add flutter.jar dependencies to all <buildType>Api configurations, including custom ones // Add flutter.jar dependencies to all <buildType>Api configurations, including custom ones
// added after applying the Flutter plugin. // added after applying the Flutter plugin.
...@@ -373,15 +359,11 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -373,15 +359,11 @@ class FlutterPlugin implements Plugin<Project> {
* *
* Note: The BuildType DSL type is not public, and is therefore omitted from the signature. * Note: The BuildType DSL type is not public, and is therefore omitted from the signature.
* *
* @return "debug", "profile", "dynamicProfile", "dynamicRelease", or "release" (fall-back). * @return "debug", "profile", or "release" (fall-back).
*/ */
private static String buildModeFor(buildType) { private static String buildModeFor(buildType) {
if (buildType.name == "profile") { if (buildType.name == "profile") {
return "profile" return "profile"
} else if (buildType.name == "dynamicProfile") {
return "dynamicProfile"
} else if (buildType.name == "dynamicRelease") {
return "dynamicRelease"
} else if (buildType.debuggable) { } else if (buildType.debuggable) {
return "debug" return "debug"
} }
...@@ -391,10 +373,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -391,10 +373,6 @@ class FlutterPlugin implements Plugin<Project> {
private static String getEngineArtifactDirName(buildType, targetArch) { private static String getEngineArtifactDirName(buildType, targetArch) {
if (buildType.name == "profile") { if (buildType.name == "profile") {
return "${targetArch}-profile" return "${targetArch}-profile"
} else if (buildType.name == "dynamicProfile") {
return "${targetArch}-dynamic-profile"
} else if (buildType.name == "dynamicRelease") {
return "${targetArch}-dynamic-release"
} else if (buildType.debuggable) { } else if (buildType.debuggable) {
return "${targetArch}" return "${targetArch}"
} }
...@@ -742,15 +720,12 @@ abstract class BaseFlutterTask extends DefaultTask { ...@@ -742,15 +720,12 @@ abstract class BaseFlutterTask extends DefaultTask {
if (buildMode == "debug") { if (buildMode == "debug") {
args "--debug" args "--debug"
} }
if (buildMode == "profile" || buildMode == "dynamicProfile") { if (buildMode == "profile") {
args "--profile" args "--profile"
} }
if (buildMode == "release" || buildMode == "dynamicRelease") { if (buildMode == "release") {
args "--release" args "--release"
} }
if (buildMode == "dynamicProfile" || buildMode == "dynamicRelease") {
args "--dynamic"
}
} }
} }
} }
......
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