From a75c9593972b95d3edfa62c6c8db62336d3efa9b Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Thu, 2 May 2019 14:52:50 -0700
Subject: [PATCH 1/2] remove legacy build deps

---
 shell/platform/android/BUILD.gn | 79 +++++++++++++--------------------
 1 file changed, 32 insertions(+), 47 deletions(-)

diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index 4dad12890cf81..3ea9f8bfea548 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
 import("$flutter_root/common/config.gni")
 import("$flutter_root/shell/config.gni")
 import("$flutter_root/shell/gpu/gpu.gni")
@@ -90,10 +89,13 @@ shared_library("flutter_shell_native") {
   ldflags = [ "-Wl,--version-script=" + rebase_path("android_exports.lst") ]
 }
 
-java_library("flutter_shell_java") {
-  supports_android = true
+action("flutter_shell_java") {
+  script = "//build/android/gyp/javac.py"
+  depfile = "$target_gen_dir/$target_name.d"
 
-  java_files = [
+  jar_path = "$root_out_dir/flutter_java.jar"
+
+  sources = [
     "io/flutter/app/FlutterActivity.java",
     "io/flutter/app/FlutterActivityDelegate.java",
     "io/flutter/app/FlutterActivityEvents.java",
@@ -171,56 +173,39 @@ java_library("flutter_shell_java") {
     "io/flutter/view/VsyncWaiter.java",
   ]
 
-  java_files +=
+  sources +=
       [ "$flutter_root/third_party/bsdiff/io/flutter/util/BSDiff.java" ]
 
-  deps = [
-    ":android_arch_lifecycle_common",
-    ":android_arch_lifecycle_viewmodel",
-    ":android_support_annotations",
-    ":android_support_compat",
-    ":android_support_fragment",
-    ":android_support_v13",
+  android_support_jars = [
+    "//third_party/android_support/android_support_v13.jar",
+    "//third_party/android_support/android_support_compat.jar",
+    "//third_party/android_support/android_support_annotations.jar",
+    "//third_party/android_support/android_support_fragment.jar",
+    "//third_party/android_support/android_arch_lifecycle_common.jar",
+    "//third_party/android_support/android_arch_lifecycle_viewmodel.jar",
   ]
 
-  jar_path = "$root_out_dir/flutter_java.jar"
-}
-
-java_prebuilt("android_support_v13") {
-  supports_android = true
-
-  jar_path = "//third_party/android_support/android_support_v13.jar"
-}
-
-java_prebuilt("android_support_compat") {
-  supports_android = true
-
-  jar_path = "//third_party/android_support/android_support_compat.jar"
-}
-
-java_prebuilt("android_support_annotations") {
-  supports_android = true
-
-  jar_path = "//third_party/android_support/android_support_annotations.jar"
-}
-
-java_prebuilt("android_support_fragment") {
-  supports_android = true
-
-  jar_path = "//third_party/android_support/android_support_fragment.jar"
-}
-
-java_prebuilt("android_arch_lifecycle_common") {
-  supports_android = true
+  outputs = [
+    depfile,
+    jar_path,
+    jar_path + ".md5.stamp",
+  ]
+  inputs = [ android_sdk_jar ]
+  inputs += android_support_jars
 
-  jar_path = "//third_party/android_support/android_arch_lifecycle_common.jar"
-}
+  _rebased_jar_path = rebase_path(jar_path, root_build_dir)
+  _rebased_depfile = rebase_path(depfile, root_build_dir)
+  _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
+  _rebased_classpath = [ _rebased_android_sdk_jar ] + rebase_path(android_support_jars, root_build_dir)
 
-java_prebuilt("android_arch_lifecycle_viewmodel") {
-  supports_android = true
+  args = [
+    "--depfile=$_rebased_depfile",
+    "--jar-path=$_rebased_jar_path",
+    "--classpath=$_rebased_classpath",
+    "--bootclasspath=$_rebased_android_sdk_jar",
+  ]
 
-  jar_path =
-      "//third_party/android_support/android_arch_lifecycle_viewmodel.jar"
+  args += rebase_path(sources, root_build_dir)
 }
 
 action("icudtl_object") {

From a38565f1dd2e65faee1fda37f7a1ab5251cd0623 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Thu, 2 May 2019 15:09:26 -0700
Subject: [PATCH 2/2] format

---
 shell/platform/android/BUILD.gn | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index 3ea9f8bfea548..6f06235bebb23 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -173,8 +173,7 @@ action("flutter_shell_java") {
     "io/flutter/view/VsyncWaiter.java",
   ]
 
-  sources +=
-      [ "$flutter_root/third_party/bsdiff/io/flutter/util/BSDiff.java" ]
+  sources += [ "$flutter_root/third_party/bsdiff/io/flutter/util/BSDiff.java" ]
 
   android_support_jars = [
     "//third_party/android_support/android_support_v13.jar",
@@ -190,13 +189,16 @@ action("flutter_shell_java") {
     jar_path,
     jar_path + ".md5.stamp",
   ]
-  inputs = [ android_sdk_jar ]
+  inputs = [
+    android_sdk_jar,
+  ]
   inputs += android_support_jars
 
   _rebased_jar_path = rebase_path(jar_path, root_build_dir)
   _rebased_depfile = rebase_path(depfile, root_build_dir)
   _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
-  _rebased_classpath = [ _rebased_android_sdk_jar ] + rebase_path(android_support_jars, root_build_dir)
+  _rebased_classpath = [ _rebased_android_sdk_jar ] +
+                       rebase_path(android_support_jars, root_build_dir)
 
   args = [
     "--depfile=$_rebased_depfile",