diff options
| author | agrieve <agrieve@chromium.org> | 2015-09-23 15:09:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-23 22:10:22 +0000 |
| commit | 3bd8449dd562b934d6f0158546d5be9fc25d371c (patch) | |
| tree | 46bbccab6304a312aae5aa20c3ccea9b1b732c8c /build | |
| parent | 4fa991d046bb40294bb3517dc7ad0f05d19b8b49 (diff) | |
| download | chromium_src-3bd8449dd562b934d6f0158546d5be9fc25d371c.zip chromium_src-3bd8449dd562b934d6f0158546d5be9fc25d371c.tar.gz chromium_src-3bd8449dd562b934d6f0158546d5be9fc25d371c.tar.bz2 | |
GN: Don't build final_dex when building *_incremental targets
The final dex is not required and slow to build.
BUG=533442
Review URL: https://codereview.chromium.org/1354153004
Cr-Commit-Position: refs/heads/master@{#350373}
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/android/internal_rules.gni | 11 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 0fb0ff9..072da6e 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -627,6 +627,10 @@ template("create_apk") { 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)) { @@ -759,7 +763,7 @@ template("create_apk") { 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 = [ @@ -789,7 +793,8 @@ template("create_apk") { # 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 } @@ -809,7 +814,7 @@ template("create_apk") { _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, ] diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 1c12e87..f77d150 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -1540,8 +1540,10 @@ template("android_apk") { ":$process_resources_target", ":$final_dex_target_name", ] + incremental_deps = _android_manifest_deps + [ ":$process_resources_target" ] if (defined(invoker.deps)) { deps += invoker.deps + incremental_deps += invoker.deps } if (defined(invoker.asset_location)) { @@ -1596,6 +1598,7 @@ template("android_apk") { ":${_template_name}__prepare_native", ":${_manifest_rule}", ] + incremental_deps = deps } } |