Remove unused GENERATE_LIBRARY_R tool
"GENERATE_LIBRARY_R" does not appear anywhere in Bazel.
RELNOTES: Removed dead code
PiperOrigin-RevId: 258525982
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
deleted file mode 100644
index 0e86f5c..0000000
--- a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2017 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.android;
-
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Strings;
-import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
-import com.google.devtools.build.android.AndroidResourceProcessor.AaptConfigOptions;
-import com.google.devtools.build.android.Converters.PathConverter;
-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.OptionsBase;
-import com.google.devtools.common.options.OptionsParser;
-import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Generates the R class for an android_library with made up field initializers for the ids. The
- * real ids will be assigned when the android_binary is built.
- *
- * <p>Collects the R class fields from the parsed resource, and then writes out the resource class
- * files to a jar.
- */
-public class LibraryRClassGeneratorAction {
-
- private static final Logger logger =
- Logger.getLogger(LibraryRClassGeneratorAction.class.getName());
-
- /** Flag specifications for this action. */
- public static final class Options extends OptionsBase {
- @Option(
- name = "classJarOutput",
- defaultValue = "null",
- converter = PathConverter.class,
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- category = "output",
- help = "Path for the generated java class jar."
- )
- public Path classJarOutput;
-
- @Option(
- name = "packageForR",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- category = "config",
- help = "Custom java package to generate the R symbols files."
- )
- public String packageForR;
-
- @Option(
- name = "symbol",
- allowMultiple = true,
- defaultValue = "",
- converter = PathConverter.class,
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- category = "config",
- help = "Parsed symbol binaries to write as R classes."
- )
- public List<Path> symbols;
-
- @Option(
- name = "targetLabel",
- defaultValue = "null",
- category = "input",
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "A label to add to the output jar's manifest as 'Target-Label'"
- )
- public String targetLabel;
-
- @Option(
- name = "injectingRuleKind",
- defaultValue = "null",
- category = "input",
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "A string to add to the output jar's manifest as 'Injecting-Rule-Kind'"
- )
- public String injectingRuleKind;
- }
-
- public static void main(String[] args) throws Exception {
- final Stopwatch timer = Stopwatch.createStarted();
- OptionsParser optionsParser =
- OptionsParser.builder()
- .optionsClasses(Options.class, AaptConfigOptions.class)
- .argsPreProcessor(new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()))
- .build();
- optionsParser.parseAndExitUponError(args);
- AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
- Options options = optionsParser.getOptions(Options.class);
- logger.fine(
- String.format("Option parsing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
- try (ScopedTemporaryDirectory scopedTmp =
- new ScopedTemporaryDirectory("android_resource_generated")) {
- AndroidResourceClassWriter resourceClassWriter =
- AndroidResourceClassWriter.createWith(
- aaptConfigOptions.androidJar,
- scopedTmp.getPath(),
- Strings.nullToEmpty(options.packageForR));
- resourceClassWriter.setIncludeClassFile(true);
- resourceClassWriter.setIncludeJavaFile(false);
- logger.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-
- final ParsedAndroidData data =
- AndroidParsedDataDeserializer.deserializeSymbolsToData(options.symbols);
- logger.fine(
- String.format("Deserialization finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-
- data.writeResourcesTo(resourceClassWriter);
- resourceClassWriter.flush();
- logger.fine(
- String.format("R writing finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
-
- AndroidResourceOutputs.createClassJar(
- scopedTmp.getPath(),
- options.classJarOutput,
- options.targetLabel,
- options.injectingRuleKind);
- logger.fine(
- String.format(
- "Creating class jar finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
- } catch (IOException | MergingException | DeserializationException e) {
- logger.log(Level.SEVERE, "Errors during R generation.", e);
- throw e;
- }
- }
-}
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
index 8e70ec0..c1eddd1 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
@@ -78,12 +78,6 @@
RClassGeneratorAction.main(args);
}
},
- GENERATE_LIBRARY_R() {
- @Override
- void call(String[] args) throws Exception {
- LibraryRClassGeneratorAction.main(args);
- }
- },
GENERATE_ROBOLECTRIC_R() {
@Override
void call(String[] args) throws Exception {
@@ -187,7 +181,7 @@
effectTags = {OptionEffectTag.UNKNOWN},
help =
"The processing tool to execute. "
- + "Valid tools: PACKAGE, VALIDATE, GENERATE_BINARY_R, GENERATE_LIBRARY_R, PARSE, "
+ + "Valid tools: PACKAGE, VALIDATE, GENERATE_BINARY_R, PARSE, "
+ "MERGE, GENERATE_AAR, SHRINK, MERGE_MANIFEST, COMPILE_LIBRARY_RESOURCES, "
+ "LINK_STATIC_LIBRARY, AAPT2_PACKAGE, SHRINK_AAPT2, MERGE_COMPILED.")
public Tool tool;
