From 0fa4cf2384c5778651896531263b9637aaa5f248 Mon Sep 17 00:00:00 2001
From: Luca Di Grazia <luca.digrazia94@gmail.com>
Date: Sun, 4 Sep 2022 20:55:37 +0200
Subject: [PATCH]     Fix aapt2 with mobile-install v1

    Previously, the resource apk was always built with aapt regardless of configuration. This threads the aapt version into the resource processing action builder.

    Fixes: https://github.com/bazelbuild/bazel/issues/5799

    Ref: https://github.com/bazelbuild/bazel/issues/6814

    RELNOTES: mobile-install now works with aapt2. Try it out with `bazel mobile-install --android_aapt=aapt2 //my:target`
    PiperOrigin-RevId: 224566567
---
 .../build/lib/rules/android/ProcessedAndroidData.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
index fd3a7bce276..ed71f4517fe 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidData.java
@@ -178,8 +178,7 @@ public static ProcessedAndroidData processLocalTestDataFrom(
       AndroidResources resources,
       AndroidAssets assets,
       ResourceDependencies resourceDeps,
-      AssetDependencies assetDeps,
-      List<String> noCompressExtensions)
+      AssetDependencies assetDeps)
       throws InterruptedException {
 
     return builderForNonIncrementalTopLevelTarget(
@@ -194,7 +193,6 @@ public static ProcessedAndroidData processLocalTestDataFrom(
         .setCrunchPng(false)
         .withResourceDependencies(resourceDeps)
         .withAssetDependencies(assetDeps)
-        .setUncompressedExtensions(noCompressExtensions)
         .build(dataContext, resources, assets, manifest, dataBindingContext);
   }
 
@@ -268,7 +266,7 @@ private static AndroidResourcesProcessorBuilder builderForTopLevelTarget(
         .setApplicationId(manifestValues.get("applicationId"))
         .setVersionCode(manifestValues.get("versionCode"))
         .setVersionName(manifestValues.get("versionName"))
-        .setThrowOnResourceConflict(dataContext.throwOnResourceConflict())
+        .setThrowOnResourceConflict(dataContext.getAndroidConfig().throwOnResourceConflict())
 
         // Output
         .setProguardOut(