Remove some deprecated resources flags.

RELNOTES: None
PiperOrigin-RevId: 191624839

1 files changed, 3 insertions, 26 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
index 9213149e5b..ff3256d6ae 100644
--- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
@@ -14,20 +14,17 @@
 package com.google.devtools.build.android;
 
 import com.android.builder.core.VariantConfiguration;
-import com.android.builder.dependency.SymbolFileProvider;
 import com.android.utils.StdLogger;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.devtools.build.android.Converters.DependencySymbolFileProviderConverter;
-import com.google.devtools.build.android.Converters.DependencySymbolFileProviderListConverter;
 import com.google.devtools.build.android.Converters.PathConverter;
 import com.google.devtools.build.android.resources.ResourceSymbols;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
-import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
@@ -109,24 +106,6 @@ public class RClassGeneratorAction {
     )
     public List<DependencySymbolFileProvider> libraries;
 
-    // TODO(laszlocsomor): remove this flag after 2018-02-28 (about 6 months from now). Everyone
-    // should have updated to newer Bazel versions by then.
-    @Deprecated
-    @Option(
-      name = "libraries",
-      defaultValue = "",
-      deprecationWarning = "Deprecated in favour of \"--library\"",
-      converter = DependencySymbolFileProviderListConverter.class,
-      category = "input",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help =
-          "R.txt and manifests for the libraries in this binary's deps. We will write "
-              + "class files for the libraries as well. Expected format: lib1/R.txt[:lib2/R.txt]",
-      metadataTags = {OptionMetadataTag.DEPRECATED}
-    )
-    public List<DependencySymbolFileProvider> deprecatedLibraries;
-
     @Option(
       name = "classJarOutput",
       defaultValue = "null",
@@ -174,8 +153,6 @@ public class RClassGeneratorAction {
       Path classOutPath = tmp.resolve("compiled_classes");
 
       logger.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-      List<SymbolFileProvider> libraries =
-          Converters.concatLists(options.libraries, options.deprecatedLibraries);
       // Note that we need to write the R class for the main binary (so proceed even if there
       // are no libraries).
       if (options.primaryRTxt != null) {
@@ -187,7 +164,7 @@ public class RClassGeneratorAction {
         Multimap<String, ResourceSymbols> libSymbolMap = ArrayListMultimap.create();
         ResourceSymbols fullSymbolValues =
             resourceProcessor.loadResourceSymbolTable(
-                libraries, appPackageName, options.primaryRTxt, libSymbolMap);
+                options.libraries, appPackageName, options.primaryRTxt, libSymbolMap);
         logger.fine(
             String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         // For now, assuming not used for libraries and setting final access for fields.
@@ -195,10 +172,10 @@ public class RClassGeneratorAction {
             libSymbolMap, appPackageName, classOutPath, true /* finalFields */);
         logger.fine(
             String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-      } else if (!libraries.isEmpty()) {
+      } else if (!options.libraries.isEmpty()) {
         Multimap<String, ResourceSymbols> libSymbolMap = ArrayListMultimap.create();
         ResourceSymbols fullSymbolValues =
-            resourceProcessor.loadResourceSymbolTable(libraries, null, null, libSymbolMap);
+            resourceProcessor.loadResourceSymbolTable(options.libraries, null, null, libSymbolMap);
         logger.fine(
             String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         // For now, assuming not used for libraries and setting final access for fields.