Revert "Collect list of Android plugins from .flutter-plugins-dependencies (flutter#57907)" (flutter#58732)

jonahwilliams · web-flow · commit 395d27aa9b8d · 2020-06-04T16:16:18.000-07:00
This reverts commit 253eb1c.
diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
@@ -372,28 +372,17 @@ class FlutterPlugin implements Plugin<Project> {
     }
 
     private Properties getPluginList() {
-
+        File pluginsFile = new File(project.projectDir.parentFile.parentFile, '.flutter-plugins')
+        Properties allPlugins = readPropertiesIfExist(pluginsFile)
         Properties androidPlugins = new Properties()
-
-        def flutterProjectRoot = project.projectDir.parentFile.parentFile
-        def pluginsFile = new File(flutterProjectRoot, '.flutter-plugins-dependencies')
-        if (!pluginsFile.exists()) {
-            return androidPlugins
-        }
-
-        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
-            def pluginDirectory = new File(androidPlugin.path, 'android')
-            assert pluginDirectory.exists()
-            androidPlugins.setProperty(androidPlugin.name, androidPlugin.path)
+        allPlugins.each { name, path ->
+            if (doesSupportAndroidPlatform(path)) {
+                androidPlugins.setProperty(name, path)
+            }
+            // TODO(amirh): log an error if this plugin was specified to be an Android
+            // plugin according to the new schema, and was missing a build.gradle file.
+            // https://github.com/flutter/flutter/issues/40784
         }
-
         return androidPlugins
     }
 
