v1.12.13+hotfix.4 cherry-picks (flutter#46632)

tvolkert · web-flow · commit fb60324e6fa7 · 2019-12-09T15:58:15.000-08:00
* f264d6c Allow plugins that don't support the Android platform * 55f0bdc Fix docker tag during upload as well
diff --git a/dev/ci/docker_linux/docker_push.sh b/dev/ci/docker_linux/docker_push.sh
@@ -2,5 +2,8 @@
 
 TAG="${CIRRUS_TAG:-latest}"
 
-sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
+# Convert "+" to "-" to make hotfix tags legal Docker tag names.
+# See https://docs.docker.com/engine/reference/commandline/tag/
+TAG=${TAG/+/-}
 
+sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
@@ -353,7 +353,7 @@ class FlutterPlugin implements Plugin<Project> {
                 return
             }
             Project dependencyProject = project.rootProject.findProject(":$pluginDependencyName")
-            if (dependencyProject == null) {
+            if (!dependencyProject.projectDir.exists() || dependencyProject == null) {
                 return
             }
             // Wait for the Android plugin to load and add the dependency to the plugin project.

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ class FlutterPlugin implements Plugin<Project> {`
`353`	`353`	`return`
`354`	`354`	`}`
`355`	`355`	`Project dependencyProject = project.rootProject.findProject(":$pluginDependencyName")`
`356`		`- if (dependencyProject == null) {`
	`356`	`+ if (!dependencyProject.projectDir.exists() \|\| dependencyProject == null) {`
`357`	`357`	`return`
`358`	`358`	`}`
`359`	`359`	`// Wait for the Android plugin to load and add the dependency to the plugin project.`