Rollback of commit 7fc35ae6890f4130b4d99a6c5007dcee91c5a8cc.

*** Reason for rollback ***

Breaks //src/test/java/com/google/devtools/build/lib:bazel-rules-tests

http://ci.bazel.io/view/Dashboard/job/bazel-tests/BAZEL_VERSION=HEAD,PLATFORM_NAME=linux-x86_64/lastCompletedBuild/console

*** Original change description ***

aar_import provides JavaCompilationArgsProvider for DexArchiveAspect.

--
PiperOrigin-RevId: 144316524
MOS_MIGRATED_REVID=144316524

1 files changed, 0 insertions, 37 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
index c65c84f811..8e06123816 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
@@ -28,13 +28,10 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.java.JavaCommon;
-import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider;
-import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts;
 import com.google.devtools.build.lib.rules.java.JavaHelper;
 import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
 import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar;
 import com.google.devtools.build.lib.rules.java.JavaRuntimeJarProvider;
-import com.google.devtools.build.lib.rules.java.JavaSemantics;
 import com.google.devtools.build.lib.rules.java.JavaToolchainProvider;
 import com.google.devtools.build.lib.rules.java.Jvm;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -52,12 +49,6 @@ public class AarImport implements RuleConfiguredTargetFactory {
   private static final String ANDROID_MANIFEST = "AndroidManifest.xml";
   private static final String MERGED_JAR = "classes_and_libs_merged.jar";
 
-  private final JavaSemantics javaSemantics;
-
-  protected AarImport(JavaSemantics javaSemantics) {
-    this.javaSemantics = javaSemantics;
-  }
-
   @Override
   public ConfiguredTarget create(RuleContext ruleContext)
       throws InterruptedException, RuleErrorException {
@@ -125,23 +116,6 @@ public class AarImport implements RuleConfiguredTargetFactory {
       }
     }
 
-    ImmutableList<TransitiveInfoCollection> targets =
-        ImmutableList.<TransitiveInfoCollection>copyOf(
-            ruleContext.getPrerequisites("exports", Mode.TARGET));
-    JavaCommon common =
-        new JavaCommon(
-            ruleContext,
-            javaSemantics,
-            /* sources = */ ImmutableList.<Artifact>of(),
-            /* compileDeps = */ targets,
-            /* runtimeDeps = */ targets,
-            /* bothDeps = */ targets);
-    common.setJavaCompilationArtifacts(
-        new JavaCompilationArtifacts.Builder()
-            .addRuntimeJar(mergedJar)
-            .addCompileTimeJar(mergedJar)
-            .build());
-
     return ruleBuilder
         .setFilesToBuild(filesToBuildBuilder.build())
         .addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY)
@@ -153,17 +127,6 @@ public class AarImport implements RuleConfiguredTargetFactory {
                 AndroidCommon.collectTransitiveNativeLibsZips(ruleContext).add(nativeLibs).build()))
         .addProvider(
             JavaRuntimeJarProvider.class, new JavaRuntimeJarProvider(ImmutableList.of(mergedJar)))
-        .addProvider(
-            JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider.create(
-                common.collectJavaCompilationArgs(
-                    /* recursive = */ false,
-                    JavaCommon.isNeverLink(ruleContext),
-                    /* srcLessDepsExport = */ false),
-                common.collectJavaCompilationArgs(
-                    /* recursive = */ true,
-                    JavaCommon.isNeverLink(ruleContext),
-                    /* srcLessDepsExport = */ false)))
         .addProvider(JavaRuleOutputJarsProvider.class, jarProviderBuilder.build())
         .build();
   }