From 1a6ca6f47aef36d56b5cb2f9da114af75dde583d Mon Sep 17 00:00:00 2001 From: ajmichael Date: Thu, 25 Jan 2018 13:53:08 -0800 Subject: [PATCH] Step 1 of removing android_sdk.annotations_jar. It seems we don't actually need it for anything. The next step will be to remove the flag from the tools, to stop passing it in all android_sdk rules and then to delete it from android_sdk. RELNOTES: None PiperOrigin-RevId: 183285855 --- .../rules/android/AndroidResourceValidatorActionBuilder.java | 3 --- .../lib/rules/android/AndroidResourcesProcessorBuilder.java | 3 --- .../devtools/build/lib/rules/android/AndroidRuleClasses.java | 1 - .../google/devtools/build/lib/rules/android/AndroidSdk.java | 2 -- .../devtools/build/lib/rules/android/AndroidSdkProvider.java | 4 ---- .../lib/rules/android/ResourceShrinkerActionBuilder.java | 3 --- 6 files changed, 16 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java index 251813a66f8c9e..f89dfdd5367792 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java @@ -229,9 +229,6 @@ private ResourceContainer createValidateAction( ImmutableList.Builder inputs = ImmutableList.builder(); - builder.addExecPath("--annotationJar", sdk.getAnnotationsJar()); - inputs.add(sdk.getAnnotationsJar()); - builder.addExecPath("--androidJar", sdk.getAndroidJar()); inputs.add(sdk.getAndroidJar()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java index 275af451a81916..16ebb20876feb9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java @@ -449,9 +449,6 @@ private void configureCommonFlags( builder.add("--buildToolsVersion", sdk.getBuildToolsVersion()); } - builder.addExecPath("--annotationJar", sdk.getAnnotationsJar()); - inputs.add(sdk.getAnnotationsJar()); - builder.addExecPath("--androidJar", sdk.getAndroidJar()); inputs.add(sdk.getAndroidJar()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 1e94bd189e7198..b084e0f60f16fa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -449,7 +449,6 @@ public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { .cfg(HostTransition.INSTANCE) .allowedFileTypes(ANY_FILE)) .add(attr("annotations_jar", LABEL) - .mandatory() .cfg(HostTransition.INSTANCE) .allowedFileTypes(ANY_FILE)) .add(attr("main_dex_classes", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java index 9f79e3a752c8a4..e8f7051b8042f1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java @@ -60,7 +60,6 @@ public ConfiguredTarget create(RuleContext ruleContext) Artifact sourceProperties = ruleContext.getHostPrerequisiteArtifact("source_properties"); Artifact shrinkedAndroidJar = ruleContext.getPrerequisiteArtifact("shrinked_android_jar", Mode.HOST); - Artifact annotationsJar = ruleContext.getPrerequisiteArtifact("annotations_jar", Mode.HOST); Artifact mainDexClasses = ruleContext.getPrerequisiteArtifact("main_dex_classes", Mode.HOST); if (ruleContext.hasErrors()) { @@ -77,7 +76,6 @@ public ConfiguredTarget create(RuleContext ruleContext) androidJar, sourceProperties, shrinkedAndroidJar, - annotationsJar, mainDexClasses, adb, dx, diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java index 5fb856bb8f1362..699a870283b257 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java @@ -36,7 +36,6 @@ public static AndroidSdkProvider create( Artifact androidJar, @Nullable Artifact sourceProperties, Artifact shrinkedAndroidJar, - Artifact annotationsJar, Artifact mainDexClasses, FilesToRunProvider adb, FilesToRunProvider dx, @@ -56,7 +55,6 @@ public static AndroidSdkProvider create( androidJar, sourceProperties, shrinkedAndroidJar, - annotationsJar, mainDexClasses, adb, dx, @@ -101,8 +99,6 @@ public static void verifyPresence(RuleContext ruleContext) throws RuleErrorExcep public abstract Artifact getShrinkedAndroidJar(); - public abstract Artifact getAnnotationsJar(); - public abstract Artifact getMainDexClasses(); public abstract FilesToRunProvider getAdb(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java index 251672c9810aa1..5cad979ba80a4b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java @@ -151,9 +151,6 @@ public Artifact build() throws RuleErrorException { commandLine.addExecPath("--aapt", aapt.getExecutable()); } - commandLine.addExecPath("--annotationJar", sdk.getAnnotationsJar()); - inputs.add(sdk.getAnnotationsJar()); - commandLine.addExecPath("--androidJar", sdk.getAndroidJar()); inputs.add(sdk.getAndroidJar());