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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
index 9709583dda..fef8a94ce8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
@@ -105,7 +105,7 @@ public class LibraryRClassGeneratorAction {
     optionsParser.parseAndExitUponError(args);
     AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
     Options options = optionsParser.getOptions(Options.class);
-    options.symbols = PathListConverter.concatLists(options.symbols, options.deprecatedSymbols);
+    options.symbols = Converters.concatLists(options.symbols, options.deprecatedSymbols);
     logger.fine(
         String.format("Option parsing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
     try (ScopedTemporaryDirectory scopedTmp =