From 5b1dc471a4e5c40522f87047e2cd4319f3876620 Mon Sep 17 00:00:00 2001
From: Edbert Chan <edbert@uber.com>
Date: Tue, 28 Jan 2025 13:10:51 -0800
Subject: [PATCH] Adding support for ABIs for AARs

---
 rules/aar_import/impl.bzl | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/rules/aar_import/impl.bzl b/rules/aar_import/impl.bzl
index 527c5a587..5aeb7c2a8 100644
--- a/rules/aar_import/impl.bzl
+++ b/rules/aar_import/impl.bzl
@@ -345,14 +345,22 @@ def _process_jars(
     if enable_imports_deps_check:
         validation_results.append(jdeps_artifact)
 
+    stamp_jar = java_common.stamp_jar(
+                actions = ctx.actions,
+                jar = out_jar,
+                target_label = ctx.label,
+                java_toolchain = java_toolchain,
+            )
+    java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo]
+    compile_jar = java_common.run_ijar(
+        actions = ctx.actions,
+        jar = stamp_jar,
+        target_label = ctx.label,
+        java_toolchain = java_toolchain,
+    )
     java_info = JavaInfo(
         out_jar,
-        compile_jar = java_common.stamp_jar(
-            actions = ctx.actions,
-            jar = out_jar,
-            target_label = ctx.label,
-            java_toolchain = java_toolchain,
-        ),
+        compile_jar = compile_jar,
         source_jar = source_jar,
         neverlink = False,
         deps = r_java_info + java_infos,  # TODO(djwhang): Exports are not deps.