aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/ide
diff options
context:
space:
mode:
authorGravatar laszlocsomor <laszlocsomor@google.com>2017-07-17 13:09:48 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-07-17 13:41:43 +0200
commit5752463ece84ebb4fb074888cba57412ab8d86b3 (patch)
treec2c11cd91141f603045703b0054e0427165db066 /tools/ide
parent8ed126b66fc3c06bfa597aa84a4d031b1669c02c (diff)
AndroidBusyBox: deprecate path-list-type flags
This commit: - deprecates PathListConverter - removes ExistingPathListConverter because it was not used in production, only tests - deprecated List<Path> type flags that use PathListConverter - introduces new List<Path> type flags next to the deprecated ones that use @Options.allowMultiple and convert with PathConverter; the new and old lists are concatenated, yielding the flag value PathListConverter and all of its occurrences should be removed after 2018-01-31 (about 6 months from now, which is a safe enough timeframe for everyone to upgrade Bazel so it uses the new-style flags). Reason for deprecation is that colon-separated path lists don't work on Windows because paths have colons in them. Since the Android BusyBox is not intended to be executed by users but by Bazel only, there's no release notes necessary. See https://github.com/bazelbuild/bazel/issues/3264 RELNOTES: none PiperOrigin-RevId: 162193998
Diffstat (limited to 'tools/ide')
-rw-r--r--tools/ide/intellij_info_impl.bzl16
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],