diff options
author | 2017-08-04 12:56:42 +0200 | |
---|---|---|
committer | 2017-08-04 17:19:09 +0200 | |
commit | 025a7b0a33680c53d872d241fdb49f3ab578afd6 (patch) | |
tree | cfcca497c74f25361537a038a4c898b26a7af39e /src/tools/android/java/com/google/devtools/build/android/resources | |
parent | 8879b48fa1f8f5bdc39321e31b02323b9f9dd86a (diff) |
Android BusyBox: deprecate --libraries flag
Deprecate the --libraries flag of the
GENERATE_BINARY_R tool in favour of --library.
The new flag is multi-value and uses "," as the
pair-separator instead of ":".
The value converter still supports ":"-separated
pairs as well, but looks for "," first.
Old format:
--libraries=key1:value1,key2:value2,...
New format:
--library=key1,value1 --library=key2,value2
Motivation:
- the ":"-separator prevents using absolute paths
on Windows
The old flag is still supported, but will be
removed after 2018-02-28 (about 6 months from
now).
Also in this commit:
- add a new method to CustomCommandLine.Builder
to lazily construct the command line for the
--library flag
See https://github.com/bazelbuild/bazel/issues/3264
RELNOTES: none
PiperOrigin-RevId: 164246506
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/resources')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java index b98dfefa64..29ca09281a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java +++ b/src/tools/android/java/com/google/devtools/build/android/resources/ResourceSymbols.java @@ -125,7 +125,7 @@ public class ResourceSymbols { * @throws InterruptedException when there is an error loading the symbols. */ public static Multimap<String, ListenableFuture<ResourceSymbols>> loadFrom( - Collection<SymbolFileProvider> dependencies, + Iterable<SymbolFileProvider> dependencies, ListeningExecutorService executor, @Nullable String packageToExclude) throws InterruptedException, ExecutionException { |