aar_import takes advantage of Singlejar's dont_change_compression flag.

AAR embedded JARs contain some compressed files (.class) and some
non-compressed files (Java resources).

--
MOS_MIGRATED_REVID=139222696

2 files changed, 4 insertions, 0 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 65c18835c0..b993fb052d 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
@@ -177,6 +177,7 @@ public class AarImport implements RuleConfiguredTargetFactory {
         .addInput(jarsTreeArtifact)
         .addArgument("--output")
         .addOutputArgument(mergedJar)
+        .addArgument("--dont_change_compression")
         .addInput(paramFile)
         .addArgument("@" + paramFile.getExecPathString())
         .build(ruleContext);
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AarImportTest.java
index 0273e6e6ac..7152c85d35 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AarImportTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AarImportTest.java
@@ -132,6 +132,9 @@ public class AarImportTest extends BuildViewTestCase {
 
     Artifact classesJar = outputJars.iterator().next().getClassJar();
     assertThat(classesJar.getFilename()).isEqualTo("classes_and_libs_merged.jar");
+
+    SpawnAction jarMergingAction = ((SpawnAction) getGeneratingAction(classesJar));
+    assertThat(jarMergingAction.getArguments()).contains("--dont_change_compression");
   }
 
   @Test