Commit 10ece731 authored by Andrew Grieve's avatar Andrew Grieve Committed by Chromium LUCI CQ

Android: Add missing build edge for DFM build configs

module_build_configs were not being added as inputs nor to depfile.

Bug: 1168655
Change-Id: I7576f168f219a2e45625988ecfc20ca9c0e6d2f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2640897
Commit-Queue: Peter Wen <wnwen@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845343}
parent 788040ed
......@@ -1252,7 +1252,6 @@ def main(argv):
if options.base_module_build_config:
with open(options.base_module_build_config, 'r') as f:
base_module_build_config = json.load(f)
all_inputs.append(options.base_module_build_config)
# Initialize some common config.
# Any value that needs to be queryable by dependents must go within deps_info.
......
......@@ -572,12 +572,15 @@ template("write_build_config") {
_dep_gen_dir = get_label_info(_base_label, "target_gen_dir")
_dep_name = get_label_info(_base_label, "name")
deps += [ "$_base_label$build_config_target_suffix" ]
_base_module_build_config = "$_dep_gen_dir/$_dep_name.build_config"
inputs += [ _base_module_build_config ]
args += [
"--base-module-build-config",
rebase_path("$_dep_gen_dir/$_dep_name.build_config", root_build_dir),
rebase_path(_base_module_build_config, root_build_dir),
]
}
if (defined(invoker.module_build_configs)) {
inputs += invoker.module_build_configs
_rebased_configs =
rebase_path(invoker.module_build_configs, root_build_dir)
args += [ "--module-build-configs=$_rebased_configs" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment