Skip to content

Commit 7ec801e

Browse files
committed
compute empty files in c++ binary
1 parent 088d9a3 commit 7ec801e

File tree

2 files changed

+221
-126
lines changed

2 files changed

+221
-126
lines changed

python/private/py_executable.bzl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,6 @@ def _create_zip_file(ctx, *, output, zip_main, runfiles):
809809
legacy_external_runfiles = _py_builtins.get_legacy_external_runfiles(ctx)
810810

811811
args = ctx.actions.args()
812-
args.use_param_file("%s", use_always=True)
813-
args.set_param_file_format("multiline")
814-
815812
args.add("--output", output.path)
816813
args.add("--workspace-name", ctx.workspace_name)
817814
args.add("--main-file", zip_main.path)
@@ -832,12 +829,14 @@ def _create_zip_file(ctx, *, output, zip_main, runfiles):
832829
args.add("--repo-mapping-manifest", zip_repo_mapping_manifest.path)
833830
inputs.append(zip_repo_mapping_manifest)
834831

835-
args.add_all(runfiles.empty_filenames, map_each=_get_zip_empty_path_arg)
836-
args.add_all(runfiles.files, map_each=_get_zip_path_arg)
832+
manifest = ctx.actions.args()
833+
manifest.use_param_file("%s", use_always=True)
834+
manifest.set_param_file_format("multiline")
835+
manifest.add_all(runfiles.files, map_each=_get_zip_path_arg)
837836

838837
ctx.actions.run(
839838
executable = ctx.executable._zipper,
840-
arguments = [args],
839+
arguments = [args, manifest],
841840
inputs = depset(inputs, transitive=[runfiles.files]),
842841
outputs = [output],
843842
use_default_shell_env = True,
@@ -846,10 +845,6 @@ def _create_zip_file(ctx, *, output, zip_main, runfiles):
846845
)
847846

848847

849-
def _get_zip_empty_path_arg(file):
850-
return "{}=".format(file.short_path)
851-
852-
853848
def _get_zip_path_arg(file):
854849
return "{}={}".format(file.short_path, file.path)
855850

0 commit comments

Comments
 (0)