From 841d223b3b04ce247eacaa2fc01a6588ae9b01ae Mon Sep 17 00:00:00 2001 From: Darshan Sen Date: Tue, 8 Feb 2022 23:33:33 +0530 Subject: [PATCH] build: rebuild the `dist_zip`s when the deps get modified (#32713) * build: rebuild the dist_zips when the deps get modified The dist.zip generated by the electron_dist_zip action was not getting updated when changes were being made to the dependencies, like the source files. It turns out, we were using data_deps for the dependencies instead of deps. Here is the difference: data_deps: things needed to ultimately run the thing built by a target deps: things needed to build the target So the difference in treatment of both sets of dependencies is actually intentional. Signed-off-by: Darshan Sen * fixup! build: rebuild the dist_zips when the deps get modified Signed-off-by: Darshan Sen --- BUILD.gn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 7fe689d592bd..bd4402cf8ac7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1403,11 +1403,13 @@ dist_zip("electron_dist_zip") { if (is_linux) { data_deps += [ "//sandbox/linux:chrome_sandbox" ] } + deps = data_deps outputs = [ "$root_build_dir/dist.zip" ] } dist_zip("electron_ffmpeg_zip") { data_deps = [ "//third_party/ffmpeg" ] + deps = data_deps outputs = [ "$root_build_dir/ffmpeg.zip" ] } @@ -1425,6 +1427,7 @@ group("electron_chromedriver") { dist_zip("electron_chromedriver_zip") { testonly = true data_deps = electron_chromedriver_deps + deps = data_deps outputs = [ "$root_build_dir/chromedriver.zip" ] } @@ -1443,6 +1446,7 @@ group("electron_mksnapshot") { dist_zip("electron_mksnapshot_zip") { data_deps = mksnapshot_deps + deps = data_deps outputs = [ "$root_build_dir/mksnapshot.zip" ] } @@ -1453,6 +1457,7 @@ copy("hunspell_dictionaries") { dist_zip("hunspell_dictionaries_zip") { data_deps = [ ":hunspell_dictionaries" ] + deps = data_deps flatten = true outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ] @@ -1466,6 +1471,7 @@ copy("libcxx_headers") { dist_zip("libcxx_headers_zip") { data_deps = [ ":libcxx_headers" ] + deps = data_deps flatten = true flatten_relative_to = rebase_path( "$target_gen_dir/electron_libcxx_include/buildtools/third_party/libc++/trunk", @@ -1481,6 +1487,7 @@ copy("libcxxabi_headers") { dist_zip("libcxxabi_headers_zip") { data_deps = [ ":libcxxabi_headers" ] + deps = data_deps flatten = true flatten_relative_to = rebase_path( "$target_gen_dir/electron_libcxxabi_include/buildtools/third_party/libc++abi/trunk",