Reland (2): "Fix how Gradle resolves Android plugin" (#142498)

Previous PR: #137115, 
Revert: #142464
Fixes #141940
Closes #142487

Author: Gustl22

packages/flutter_tools/gradle/module_plugin_loader.gradle

@@ -5,41 +5,26 @@
 // This file is included from `<module>/.android/include_flutter.groovy`,
 // so it can be versioned with the Flutter SDK.
 
-import groovy.json.JsonSlurper
+import java.nio.file.Paths
+
+File pathToThisDirectory = buildscript.sourceFile.parentFile
+apply from: Paths.get(pathToThisDirectory.absolutePath, "src", "main", "groovy", "native_plugin_loader.groovy")
 
 def moduleProjectRoot = project(':flutter').projectDir.parentFile.parentFile
 
-def object = null;
-String flutterModulePath = project(':flutter').projectDir.parentFile.getAbsolutePath()
-// If this logic is changed, also change the logic in app_plugin_loader.gradle.
-def pluginsFile = new File(moduleProjectRoot, '.flutter-plugins-dependencies')
-if (pluginsFile.exists()) {
-    object = new JsonSlurper().parseText(pluginsFile.text)
-    assert object instanceof Map
-    assert object.plugins instanceof Map
-    assert object.plugins.android instanceof List
-    // Includes the Flutter plugins that support the Android platform.
-    object.plugins.android.each { androidPlugin ->
-        assert androidPlugin.name instanceof String
-        assert androidPlugin.path instanceof String
-        // Skip plugins that have no native build (such as a Dart-only
-        // implementation of a federated plugin).
-        def needsBuild = androidPlugin.containsKey('native_build') ? androidPlugin['native_build'] : true
-        if (!needsBuild) {
-            return
-        }
-        def pluginDirectory = new File(androidPlugin.path, 'android')
-        assert pluginDirectory.exists()
-        include ":${androidPlugin.name}"
-        project(":${androidPlugin.name}").projectDir = pluginDirectory
-    }
+List<Map<String, Object>> nativePlugins = nativePluginLoader.getPlugins(moduleProjectRoot)
+nativePlugins.each { androidPlugin ->
+    def pluginDirectory = new File(androidPlugin.path as String, 'android')
+    assert pluginDirectory.exists()
+    include ":${androidPlugin.name}"
+    project(":${androidPlugin.name}").projectDir = pluginDirectory
 }
 
+String flutterModulePath = project(':flutter').projectDir.parentFile.getAbsolutePath()
 gradle.getGradle().projectsLoaded { g ->
     g.rootProject.beforeEvaluate { p ->
         p.subprojects { subproject ->
-            if (object != null && object.plugins != null && object.plugins.android != null
-                    && object.plugins.android.name.contains(subproject.name)) {
+            if (nativePlugins.name.contains(subproject.name)) {
                 File androidPluginBuildOutputDir = new File(flutterModulePath + File.separator
                         + "plugins_build_output" + File.separator + subproject.name);
                 if (!androidPluginBuildOutputDir.exists()) {

packages/flutter_tools/gradle/src/main/groovy/app_plugin_loader.groovy

@@ -1,39 +1,29 @@
-import groovy.json.JsonSlurper
 import org.gradle.api.Plugin
 import org.gradle.api.initialization.Settings
 
+import java.nio.file.Paths
+
 apply plugin: FlutterAppPluginLoaderPlugin
 
 class FlutterAppPluginLoaderPlugin implements Plugin<Settings> {
-    // This string must match _kFlutterPluginsHasNativeBuildKey defined in
-    // packages/flutter_tools/lib/src/flutter_plugins.dart.
-    private final String nativeBuildKey = 'native_build'
-
     @Override
     void apply(Settings settings) {
         def flutterProjectRoot = settings.settingsDir.parentFile
 
-        // If this logic is changed, also change the logic in module_plugin_loader.gradle.
-        def pluginsFile = new File(flutterProjectRoot, '.flutter-plugins-dependencies')
-        if (!pluginsFile.exists()) {
-            return
+        if(!settings.ext.hasProperty('flutterSdkPath')) {
+            def properties = new Properties()
+            def localPropertiesFile = new File(settings.rootProject.projectDir, "local.properties")
+            localPropertiesFile.withInputStream { properties.load(it) }
+            settings.ext.flutterSdkPath = properties.getProperty("flutter.sdk")
+            assert settings.ext.flutterSdkPath != null, "flutter.sdk not set in local.properties"
         }
+        
+        // Load shared gradle functions
+        settings.apply from: Paths.get(settings.ext.flutterSdkPath, "packages", "flutter_tools", "gradle", "src", "main", "groovy", "native_plugin_loader.groovy")
 
-        def object = new JsonSlurper().parseText(pluginsFile.text)
-        assert object instanceof Map
-        assert object.plugins instanceof Map
-        assert object.plugins.android instanceof List
-        // Includes the Flutter plugins that support the Android platform.
-        object.plugins.android.each { androidPlugin ->
-            assert androidPlugin.name instanceof String
-            assert androidPlugin.path instanceof String
-            // Skip plugins that have no native build (such as a Dart-only implementation
-            // of a federated plugin).
-            def needsBuild = androidPlugin.containsKey(nativeBuildKey) ? androidPlugin[nativeBuildKey] : true
-            if (!needsBuild) {
-                return
-            }
-            def pluginDirectory = new File(androidPlugin.path, 'android')
+        List<Map<String, Object>> nativePlugins = settings.ext.nativePluginLoader.getPlugins(flutterProjectRoot)
+        nativePlugins.each { androidPlugin ->
+            def pluginDirectory = new File(androidPlugin.path as String, 'android')
             assert pluginDirectory.exists()
             settings.include(":${androidPlugin.name}")
             settings.project(":${androidPlugin.name}").projectDir = pluginDirectory