diff options
| author |  laszlocsomor <laszlocsomor@google.com> | 2017-07-20 10:10:45 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-20 10:33:23 +0200 |
| commit | e1d3b87302cb11a4a1bad72b22cbe4b998296314 (patch) | |
| tree | 0e9594d3c79d7624d5fbb3a1a7776d925a6034dc /tools/ide | |
| parent | 6d47707a96752d3b876bed5cfd253d5e064cbec1 (diff) | |
Automated rollback of commit 01ddfb7bf418b371859de62f4eab2f41ea9a4a4a.
This is a partial rollback.
I restored the old flags (with PathListConverter),
added the new ones, added deprecation warnings and
annotations, and added code to concat the values
of new and old.
Existing released versions of Bazel should keep
working with the new code until 2018-01-31, i.e.
for the next ~6 months. After that I'll remove the
old flags and the PathListConverter.
*** Reason for rollback ***
Fixed broken integration with release Blaze.
*** Original change description ***
Automated rollback of commit 5752463ece84ebb4fb074888cba57412ab8d86b3.
*** Reason for rollback ***
Broke too many targets.
***
RELNOTES: none
PiperOrigin-RevId: 162587548
Diffstat (limited to 'tools/ide')
| -rw-r--r-- | tools/ide/intellij_info_impl.bzl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/ide/intellij_info_impl.bzl b/tools/ide/intellij_info_impl.bzl index 0ceec5ca7a..6ec17f727a 100644 --- a/tools/ide/intellij_info_impl.bzl +++ b/tools/ide/intellij_info_impl.bzl @@ -451,18 +451,18 @@ def build_filtered_gen_jar(ctx, target, java, gen_java_sources, srcjars): filtered_jar = ctx.new_file(target.label.name + "-filtered-gen.jar") filtered_source_jar = ctx.new_file(target.label.name + "-filtered-gen-src.jar") args = [] - args += ["--filter_jars"] - args += [":".join([jar.path for jar in jar_artifacts])] - args += ["--filter_source_jars"] - args += [":".join([jar.path for jar in source_jar_artifacts])] + for jar in jar_artifacts: + args += ["--filter_jar", jar.path] + for jar in source_jar_artifacts: + args += ["--filter_source_jar", jar.path] args += ["--filtered_jar", filtered_jar.path] args += ["--filtered_source_jar", filtered_source_jar.path] if gen_java_sources: - args += ["--keep_java_files"] - args += [":".join([java_file.path for java_file in gen_java_sources])] + for java_file in gen_java_sources: + args += ["--keep_java_file", java_file.path] if srcjars: - args += ["--keep_source_jars"] - args += [":".join([source_jar.path for source_jar in srcjars])] + for source_jar in srcjars: + args += ["--keep_source_jar", source_jar.path] ctx.action( inputs = jar_artifacts + source_jar_artifacts + gen_java_sources + srcjars, outputs = [filtered_jar, filtered_source_jar], |