GN: Side-load dex files as well as native code in incremental installs

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1132 matching lines @@
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
   assert(defined(invoker.android_manifest))
   gen_dir = "$target_gen_dir/$target_name"
   base_path = "$gen_dir/$target_name"
   _build_config = "$target_gen_dir/$target_name.build_config"
   resources_zip_path = "$base_path.resources.zip"
   _all_resources_zip_path = "$base_path.resources.all.zip"
-  jar_path = "$base_path.jar"
+  _jar_path = "$base_path.jar"
+  _lib_dex_path = "$base_path.dex.jar"
+  _rebased_lib_dex_path = rebase_path(_lib_dex_path, root_build_dir)
   _template_name = target_name
 
   final_dex_path = "$gen_dir/classes.dex"
   final_dex_target_name = "${_template_name}__final_dex"
 
   _final_apk_path = ""
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
@@ skipping 115 matching lines @@
   _create_language_splits =
       defined(invoker.language_splits) && invoker.language_splits != []
 
   # Help GN understand that _create_abi_split is not unused (bug in GN).
   assert(_create_abi_split || true)
 
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {
     forward_variables_from(invoker, [ "apk_under_test" ])
     type = "android_apk"
+    jar_path = _jar_path
     dex_path = final_dex_path
     resources_zip = resources_zip_path
     build_config = _build_config
     android_manifest = _android_manifest
 
     deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
@@ skipping 72 matching lines @@
     android_manifest = _android_manifest
     chromium_code = true
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
     srcjar_deps = _srcjar_deps
-    dex_path = base_path + ".dex.jar"
+    jar_path = _jar_path
+    dex_path = _lib_dex_path
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 
   if (_dist_jar_path != "") {
     create_dist_target = "${_template_name}__create_dist_jar"
     _final_deps += [ ":$create_dist_target" ]
     _incremental_final_deps += [ ":$create_dist_target" ]
@@ skipping 11 matching lines @@
         depfile,
         _dist_jar_path,
       ]
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--output",
         rebase_path(_dist_jar_path, root_build_dir),
         "--inputs=@FileArg($_rebased_build_config:dist_jar:dependency_jars)",
       ]
-      inputs += [ jar_path ]
-      _rebased_jar_path = rebase_path([ jar_path ], root_build_dir)
+      inputs += [ _jar_path ]
+      _rebased_jar_path = rebase_path([ _jar_path ], root_build_dir)
       args += [ "--inputs=$_rebased_jar_path" ]
       deps = [
         ":$build_config_target",  # Generates the build config file.
         ":$java_target",  # Generates the jar file.
       ]
     }
   }
 
   dex("$final_dex_target_name") {
     deps = [
       ":$build_config_target",
       ":$java_target",
     ]
-    sources = [
-      jar_path,
-    ]
     inputs = [
       _build_config,
     ]
     output = final_dex_path
-    dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
-    args = [ "--inputs=@FileArg($dex_arg_key)" ]
+    _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
+    args = [
+      "--inputs=@FileArg($_dex_arg_key)",
+      _rebased_lib_dex_path,
+    ]
   }
 
   if (_native_libs != []) {
     action("${_template_name}__prepare_native") {
       forward_variables_from(invoker,
                              [
                                "data_deps",
                                "public_deps",
                              ])
       script = "//build/android/gyp/pack_relocations.py"
@@ skipping 133 matching lines @@
       deps = [
         ":${_template_name}__prepare_native",
         ":${_manifest_rule}",
       ]
     }
   }
 
   _create_incremental_script_rule_name = "${_template_name}__incremental_script"
   _incremental_final_deps += [ ":${_create_incremental_script_rule_name}" ]
   action(_create_incremental_script_rule_name) {
-    script = "//build/android/gn/create_incremental_install_script.py"
+    script = "//build/android/incremental_install/create_install_script.py"
     depfile = "$target_gen_dir/$target_name.d"
 
     _generated_script_path =
         "${root_out_dir}/bin/install_incremental_${_template_name}"
     outputs = [
       depfile,
       _generated_script_path,
     ]
 
     _rebased_apk_path_no_ext =
         rebase_path(_final_apk_path_no_ext, root_build_dir)
     _rebased_generated_script_path =
         rebase_path(_generated_script_path, root_build_dir)
     _rebased_depfile = rebase_path(depfile, root_build_dir)
+    _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [
       "--apk-path=${_rebased_apk_path_no_ext}_incremental.apk",
       "--script-output-path=$_rebased_generated_script_path",
+      "--dex-file=$_rebased_lib_dex_path",
+      "--dex-file-list=@FileArg($_dex_arg_key)",
       "--depfile=$_rebased_depfile",
     ]
     if (defined(_native_libs_dir)) {
       _rebased_native_libs_dir = rebase_path(_native_libs_dir, root_build_dir)
       args += [ "--lib-dir=$_rebased_native_libs_dir/$android_app_abi" ]
     }
     if (_create_density_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-density-*.apk" ]
     }
     if (_create_language_splits) {
@@ skipping 392 matching lines @@
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }