GN: Don't build final_dex when building *_incremental targets

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 609 matching lines @@
   }
   if (defined(invoker.dex_path)) {
     _dex_path = invoker.dex_path
   }
   _load_library_from_apk = invoker.load_library_from_apk
 
   _deps = []
   if (defined(invoker.deps)) {
     _deps = invoker.deps
   }
+  _incremental_deps = []
+  if (defined(invoker.incremental_deps)) {
+    _incremental_deps = invoker.incremental_deps
+  }
 
   _native_libs_dir = "//build/android/empty/res"
   if (defined(invoker.native_libs_dir)) {
     _native_libs_dir = invoker.native_libs_dir
   }
 
   if (defined(invoker.asset_location)) {
     _asset_location = invoker.asset_location
     assert(_asset_location != "")  # Mark as used.
   }
@@ skipping 112 matching lines @@
     android_manifest = _android_manifest
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _generate_incremental_manifest_target_name =
       "${target_name}_incremental_generate_manifest"
   _incremental_android_manifest =
       get_label_info(_generate_incremental_manifest_target_name,
                      "target_gen_dir") + "/AndroidManifest.xml"
   action(_generate_incremental_manifest_target_name) {
-    deps = _deps
+    deps = _incremental_deps
     script = "//build/android/incremental_install/generate_android_manifest.py"
     depfile = "${target_gen_dir}/${target_name}.d"
     inputs = [
       _android_manifest,
     ]
     outputs = [
       depfile,
       _incremental_android_manifest,
     ]
 
     _rebased_src_manifest = rebase_path(_android_manifest, root_build_dir)
     _rebased_incremental_manifest =
         rebase_path(_incremental_android_manifest, root_build_dir)
     args = [
       "--src-manifest=$_rebased_src_manifest",
       "--out-manifest=$_rebased_incremental_manifest",
     ]
     if (disable_incremental_isolated_processes) {
       args += [ "--disable-isolated-processes" ]
     }
   }
 
   _incremental_package_resources_target_name =
       "${target_name}_incremental__package_resources"
 
   # TODO(agrieve): See if we can speed up this step by swapping the manifest
   # from the result of the main package_resources step.
   package_resources_helper(_incremental_package_resources_target_name) {
     forward_variables_from(invoker, [ "extensions_to_not_compress" ])
-    deps = _deps + [ ":$_generate_incremental_manifest_target_name" ]
+    deps =
+        _incremental_deps + [ ":$_generate_incremental_manifest_target_name" ]
     android_manifest = _incremental_android_manifest
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
     deps = _deps + [ ":${_package_resources_target_name}" ]
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
     native_libs_dir = _native_libs_dir
     output_apk_path = _packaged_apk_path
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _incremental_package_target = "${target_name}_incremental__package"
   package_apk(_incremental_package_target) {
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
-    deps = _deps + [
+    deps = _incremental_deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
     }
 
     # TODO(agrieve): Add a placeholder .so for http://crbug.com/384638
@@ skipping 820 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }