diff options
7 files changed, 0 insertions, 27 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java index 6ca6782638..61b1634325 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java @@ -41,7 +41,6 @@ import java.util.List; * java/com/google/build/android/Aapt2ResourcePackagingAction\ * --sdkRoot path/to/sdk\ * --aapt path/to/sdk/aapt\ - * --annotationJar path/to/sdk/annotationJar\ * --adb path/to/sdk/adb\ * --zipAlign path/to/sdk/zipAlign\ * --androidJar path/to/sdk/androidJar\ diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java index cac026a543..69ad4a5e12 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java @@ -41,7 +41,6 @@ import java.util.function.Function; * Example Usage: * java/com/google/build/android/ResourceShrinkerAction * --aapt2 path to sdk/aapt2 - * --annotationJar path to sdk/annotationJar * --androidJar path to sdk/androidJar * --shrunkJar path to proguard dead code removal jar * --resources path to processed resources zip diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index 45a6e62a17..a66213fc22 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -71,7 +71,6 @@ import org.xml.sax.SAXException; * java/com/google/build/android/AndroidResourceProcessingAction\ * --sdkRoot path/to/sdk\ * --aapt path/to/sdk/aapt\ - * --annotationJar path/to/sdk/annotationJar\ * --adb path/to/sdk/adb\ * --zipAlign path/to/sdk/zipAlign\ * --androidJar path/to/sdk/androidJar\ diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java index a72d1d243a..6f458ae044 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java @@ -118,17 +118,6 @@ public class AndroidResourceProcessor { public Path featureAfter; @Option( - name = "annotationJar", - defaultValue = "null", - converter = ExistingPathConverter.class, - category = "tool", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = "Annotation Jar for builder invocations." - ) - public Path annotationJar; - - @Option( name = "androidJar", defaultValue = "null", converter = ExistingPathConverter.class, 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 a99da9b931..6f120ae165 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 @@ -41,7 +41,6 @@ import java.util.logging.Logger; * --tool PACKAGE\ * --sdkRoot path/to/sdk\ * --aapt path/to/sdk/aapt\ - * --annotationJar path/to/sdk/annotationJar\ * --adb path/to/sdk/adb\ * --zipAlign path/to/sdk/zipAlign\ * --androidJar path/to/sdk/androidJar\ diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java index 7d9f59fb0d..9f774fc679 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java @@ -60,7 +60,6 @@ import org.xml.sax.SAXException; * Example Usage: * java/com/google/build/android/ResourceShrinkerAction * --aapt path to sdk/aapt - * --annotationJar path to sdk/annotationJar * --androidJar path to sdk/androidJar * --shrunkJar path to proguard dead code removal jar * --resources path to processed resources zip diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java index 0a1e472e02..c96bd8fc75 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java @@ -63,17 +63,6 @@ public class Aapt2ConfigOptions extends OptionsBase { public Path androidJar; @Option( - name = "annotationJar", - defaultValue = "null", - converter = ExistingPathConverter.class, - category = "tool", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = "Path to the android jar for resource packaging and building apks." - ) - public Path annotationJar; - - @Option( name = "useAaptCruncher", defaultValue = "auto", category = "config", |