Skip to content

Delete getLegacyAndroidExtension and migrate the NDK fallback to the public DSL #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reidbaker-agent wants to merge 1 commit into
base: agp-plugin-buildtypes
Choose a base branch
from
Open

Delete getLegacyAndroidExtension and migrate the NDK fallback to the public DSL #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/flutter_tools/gradle/src/main/kotlin/AgpCommonExtensionWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package com.flutter.gradle
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.BuildType
import com.android.build.api.dsl.DynamicFeatureExtension
import com.android.build.api.dsl.ExternalNativeBuild
import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.dsl.Splits
import com.android.build.api.dsl.TestExtension
Expand Down Expand Up @@ -107,6 +108,16 @@ class AgpCommonExtensionWrapper(
else -> throw IllegalArgumentException(unsupportedMessage())
}

val externalNativeBuild: ExternalNativeBuild
get() =
when (backingExtension) {
is ApplicationExtension -> backingExtension.externalNativeBuild
is LibraryExtension -> backingExtension.externalNativeBuild
is DynamicFeatureExtension -> backingExtension.externalNativeBuild
is TestExtension -> backingExtension.externalNativeBuild
else -> throw IllegalArgumentException(unsupportedMessage())
}

val splits: Splits
get() =
when (backingExtension) {
Expand Down
46 changes: 14 additions & 32 deletions packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.DynamicFeatureBuildType
import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.variant.AndroidComponentsExtension
import com.android.build.gradle.BaseExtension
import com.android.builder.model.BuildType
import com.flutter.gradle.plugins.PluginHandler
import com.flutter.gradle.tasks.DeepLinkJsonFromManifestTask
Expand Down Expand Up @@ -536,22 +535,6 @@ object FlutterPluginUtils {
return project.property(PROP_LOCAL_ENGINE_BUILD_MODE) == flutterBuildMode
}

/**
* Returns BaseExtension for the project. Used for compatibility.
*
* From BaseExtension docs:
* "Don't use this extension directly Instead, use one of the following:
* ApplicationExtension, LibraryExtension, TestExtension, DynamicFeatureExtension"
*
* For ApplicationExtension use `getAndroidApplicationExtension`.
* For LibraryExtension use `getAndroidLibraryExtension`.
*/
internal fun getLegacyAndroidExtension(project: Project): BaseExtension {
// Common supertype of the android extension types.
// But maybe this should be https://developer.android.com/reference/tools/gradle-api/8.7/com/android/build/api/dsl/TestedExtension.
return project.extensions.findByType(BaseExtension::class.java)!!
}

internal fun getAndroidExtension(project: Project): AgpCommonExtensionWrapper {
// Look up by name to completely avoid importing or resolving CommonExtension
val androidExtension =
Expand Down Expand Up @@ -835,11 +818,11 @@ object FlutterPluginUtils {
}

// If the project is already configuring a native build, we don't need to do anything.
val gradleProjectAndroidExtension = getLegacyAndroidExtension(gradleProject)
val gradleProjectAndroidExtension = getAndroidExtension(gradleProject)
val externalNativeBuild = gradleProjectAndroidExtension.externalNativeBuild
val forcingNotRequired: Boolean =
externalNativeBuild?.cmake?.path != null ||
externalNativeBuild?.ndkBuild?.path != null
externalNativeBuild.cmake.path != null ||
externalNativeBuild.ndkBuild.path != null
if (forcingNotRequired) {
return
}
Expand Down Expand Up @@ -963,10 +946,9 @@ object FlutterPluginUtils {
gradleProject: Project,
flutterSdkRootPath: String
) {
val gradleProjectAndroidExtension = getLegacyAndroidExtension(gradleProject)
gradleProjectAndroidExtension.externalNativeBuild.cmake.path(
"$flutterSdkRootPath/packages/flutter_tools/gradle/src/main/scripts/CMakeLists.txt"
)
val gradleProjectAndroidExtension = getAndroidExtension(gradleProject)
gradleProjectAndroidExtension.externalNativeBuild.cmake.path =
File("$flutterSdkRootPath/packages/flutter_tools/gradle/src/main/scripts/CMakeLists.txt")

// AGP defaults to outputting build artifacts in `android/app/.cxx`. This directory is a
// build artifact, so we move it from that directory to within Flutter's build directory
Expand All @@ -978,22 +960,22 @@ object FlutterPluginUtils {
// but as we are not actually building anything (and are instead only tricking AGP into
// downloading the NDK), it is acceptable for the buildStagingDirectory to be removed
// and rebuilt when running clean builds.
gradleProjectAndroidExtension.externalNativeBuild.cmake.buildStagingDirectory(
gradleProjectAndroidExtension.externalNativeBuild.cmake.buildStagingDirectory =
gradleProject.layout.buildDirectory
.dir("../.cxx")
.get()
.asFile.path
)
.asFile

// CMake will print warnings when you try to build an empty project.
// These arguments silence the warnings - our project is intentionally
// empty.
gradleProjectAndroidExtension.buildTypes.forEach { buildType ->
buildType.externalNativeBuild.cmake.arguments(
"-Wno-dev",
"--no-warn-unused-cli",
"-DCMAKE_BUILD_TYPE=${buildType.name}"
)
buildType.externalNativeBuild.cmake.arguments +=
listOf(
"-Wno-dev",
"--no-warn-unused-cli",
"-DCMAKE_BUILD_TYPE=${buildType.name}"
)
}
}

Expand Down
Loading