diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
4 files changed, 0 insertions, 25 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 438748c5ec..71a7c79a11 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -779,7 +779,6 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { zipAlignedApk, apksUnderTest, nativeLibs); - androidSemantics.addTransitiveInfoProviders(builder, ruleContext, javaCommon, androidCommon); if (proguardOutput.getMapping() != null) { builder.add( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index 1252f292d5..98fcb45946 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -200,7 +200,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { null, ImmutableList.<Artifact>of(), NativeLibs.EMPTY); - androidSemantics.addTransitiveInfoProviders(builder, ruleContext, javaCommon, androidCommon); NestedSetBuilder<Artifact> transitiveResourcesJars = collectTransitiveResourceJars(ruleContext); if (androidCommon.getResourceClassJar() != null) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index ad05fa7508..b562eac1ea 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -289,8 +289,6 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor generatedExtensionRegistryProvider); } - addExtraProviders(builder, javaCommon, classJar, srcJar, genClassJar, genSourceJar); - JavaRuleOutputJarsProvider ruleOutputJarsProvider = javaRuleOutputJarsProviderBuilder.build(); javaCommon.addTransitiveInfoProviders(builder, filesToBuild, classJar); @@ -333,14 +331,6 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor protected abstract JavaSemantics createJavaSemantics(); - protected abstract void addExtraProviders( - RuleConfiguredTargetBuilder builder, - JavaCommon javaCommon, - Artifact classJar, - Artifact srcJar, - Artifact genClassJar, - Artifact genSourceJar); - protected abstract ImmutableList<String> getJvmFlags(RuleContext ruleContext, String testClass); protected abstract String getMainClass( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java index b791b69f01..76fd3e087c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java @@ -16,11 +16,9 @@ package com.google.devtools.build.lib.rules.android; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.OutputGroupProvider; -import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; -import com.google.devtools.build.lib.rules.java.JavaCommon; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaSemantics; import com.google.devtools.build.lib.rules.java.JavaTargetAttributes; @@ -41,17 +39,6 @@ public interface AndroidSemantics { OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "idl_jars"; /** - * Adds transitive info providers for {@code android_binary} and {@code android_library} rules. - * @throws InterruptedException - */ - void addTransitiveInfoProviders( - RuleConfiguredTargetBuilder builder, - RuleContext ruleContext, - JavaCommon javaCommon, - AndroidCommon androidCommon) - throws InterruptedException; - - /** * Add additional resources to IDE info for {@code android_binary} and {@code android_library} * * @param ruleContext rule context for target rule |