Pass android.jar

bazelbuild · Mar 8, 2024 · 5f6c2ba · 5f6c2ba
1 parent 9f8651d
commit 5f6c2ba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/rules/android_binary_internal/impl.bzl b/rules/android_binary_internal/impl.bzl
@@ -208,7 +208,18 @@ def _process_jvm(ctx, db_ctx, packaged_resources_ctx, stamp_ctx, **_unused_ctxs)
         javac_opts = ctx.attr.javacopts + db_ctx.javac_opts,
         r_java = packaged_resources_ctx.r_java,
         enable_deps_without_srcs = True,
-        deps = utils.collect_providers(JavaInfo, utils.dedupe_split_attr(ctx.split_attr.deps) + stamp_ctx.deps),
+        deps = (
+            utils.collect_providers(JavaInfo, utils.dedupe_split_attr(ctx.split_attr.deps) + stamp_ctx.deps) +
+            [
+                JavaInfo(
+                    output_jar = get_android_sdk(ctx).android_jar,
+                    compile_jar = get_android_sdk(ctx).android_jar,
+                    # The android_jar must not be compiled into the test, it
+                    # will bloat the Jar with no benefit.
+                    neverlink = True,
+                ),
+            ]
+        ),
         plugins =
             utils.collect_providers(JavaPluginInfo, ctx.attr.plugins) +
             db_ctx.java_plugins,

diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl
@@ -273,8 +273,18 @@ def _process_jvm(ctx, exceptions_ctx, resources_ctx, idl_ctx, db_ctx, **unused_s
         srcs = ctx.files.srcs + idl_ctx.idl_java_srcs + db_ctx.java_srcs,
         javac_opts = ctx.attr.javacopts + db_ctx.javac_opts,
         r_java = resources_ctx.r_java,
-        deps =
-            utils.collect_providers(JavaInfo, ctx.attr.deps, idl_ctx.idl_deps),
+        deps = (
+            utils.collect_providers(JavaInfo, ctx.attr.deps, idl_ctx.idl_deps) +
+            [
+                JavaInfo(
+                    output_jar = get_android_sdk(ctx).android_jar,
+                    compile_jar = get_android_sdk(ctx).android_jar,
+                    # The android_jar must not be compiled into the test, it
+                    # will bloat the Jar with no benefit.
+                    neverlink = True,
+                ),
+            ]
+        ),
         exports = utils.collect_providers(JavaInfo, ctx.attr.exports),
         plugins = utils.collect_providers(JavaPluginInfo, ctx.attr.plugins, db_ctx.java_plugins),
         exported_plugins = utils.collect_providers(