Commit 51ce7e6e authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

Remove the chrome_child build artifacts when doing a single DLL build.

This help ensuring that an old version of chrome_child.dll won't be
accidently packaged in the installer.

This code should be removed once we drop support for the multi DLL
build.

Tested manually on a local build.

Bug: 1017245, 726150
Change-Id: I49c3885f937d6b034d94340e23cd83341fc3bd77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876232
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708843}
parent 09120a10
......@@ -85,6 +85,27 @@ if (is_win) {
":chrome_initial",
]
}
if (!is_multi_dll_chrome) {
# Remove the chrome_child.dll build artifacts from the build directory if
# they're not needed to avoid packaging them in the installer.
# TODO(sebmarchand): Remove this once the multi DLL build isn't supported.
action("remove_chrome_child_artifacts") {
script = "//build/rm.py"
stamp = "$target_gen_dir/chrome_child_clean_up_stamp"
outputs = [
stamp,
]
args = [
"--stamp",
rebase_path(stamp, root_build_dir),
"-f",
"chrome_child.dll",
"chrome_child.dll.lib",
"chrome_child.dll.pdb",
]
}
}
}
# This target exists above chrome and it's main components in the dependency
......@@ -357,6 +378,10 @@ if (is_win) {
]
if (is_multi_dll_chrome) {
data_deps += [ ":chrome_child" ]
} else {
deps = [
":remove_chrome_child_artifacts",
]
}
}
......
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