Merge pull request #2266 from mpcomplete/apk.tool

Support dynamic registration of mojo services on Android

engine/src/flutter/build/config/android/rules.gni

@@ -1577,7 +1577,7 @@ template("android_apk") {
   }
 
   final_deps += [ ":$final_dex_target_name" ]
-  dex("$final_dex_target_name") {
+  dex("${final_dex_target_name}_jar") {
     deps = [
       ":$build_config_target",
       ":$java_target",
@@ -1588,11 +1588,21 @@ template("android_apk") {
     inputs = [
       _build_config,
     ]
-    output = final_dex_path
+    output = "${final_dex_path}.jar"
     dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [ "--inputs=@FileArg($dex_arg_key)" ]
   }
 
+  dex("$final_dex_target_name") {
+    deps = [
+      ":${final_dex_target_name}_jar",
+    ]
+    sources = [
+      "${final_dex_path}.jar",
+    ]
+    output = final_dex_path
+  }
+
   if (_native_libs != []) {
     action("${_template_name}__prepare_native") {
       script = "//build/android/gyp/pack_relocations.py"

engine/src/flutter/sky/BUILD.gn

@@ -28,9 +28,17 @@ group("sky") {
 
   if (is_android) {
     deps += [ "//sky/services/activity" ]
+
+    # TODO(mpcomplete): This is temporary until we move GCM out of the engine
+    # repo.
+    deps += [
+      "//sky/services/gcm:gcm_lib",
+      "//sky/services/gcm:interfaces_java",
+    ]
   }
 
   if (!is_android) {
     deps += [ "//third_party/mesa:osmesa" ]
   }
+
 }

engine/src/flutter/sky/tools/release_engine.py

@@ -48,8 +48,10 @@ ZIP_ARTIFACTS = {
         'icudtl.dat',
         'dist/shell/SkyShell.apk',
         'dist/shell/flutter.mojo',
-        'gen/sky/shell/shell/classes.dex',
+        'gen/sky/shell/shell/classes.dex.jar',
         'gen/sky/shell/shell/shell/libs/armeabi-v7a/libsky_shell.so',
+        # TODO(mpcomplete): obsolete. Remove after updating the flutter tool.
+        'gen/sky/shell/shell/classes.dex',
     ],
     'linux-x64': [
         'dist/shell/icudtl.dat',