diff options
| author | Romain Jobredeaux <jobredeaux@google.com> | 2023-03-10 02:26:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-10 02:26:54 +0000 |
| commit | 9d8a3b9c570c2d5ac22bbc9c301bae3c81c81bd3 (patch) | |
| tree | 0923e7d2e0fb11e98bec5fb77cb069166f6a5153 /rules/apex/apex_aab.bzl | |
| parent | 409b70b566d1c1b7ef7deed3b95c124db77e5335 (diff) | |
| parent | 6f81a0960139ec465c73357d475fe88d1cc10983 (diff) | |
| download | bazel-9d8a3b9c570c2d5ac22bbc9c301bae3c81c81bd3.tar.gz | |
Merge "Use platform resolution instead of local_jdk for java runtime"
Diffstat (limited to 'rules/apex/apex_aab.bzl')
| -rw-r--r-- | rules/apex/apex_aab.bzl | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/rules/apex/apex_aab.bzl b/rules/apex/apex_aab.bzl index dab873c8..cd3bf996 100644 --- a/rules/apex/apex_aab.bzl +++ b/rules/apex/apex_aab.bzl @@ -177,11 +177,12 @@ def _sign_bundle(ctx, aapt2, avbtool, module_name, bundle_file, apex_info): is_executable = False, ) + java_runtime = ctx.attr._java_runtime[java_common.JavaRuntimeInfo] + # Tools tools = [ ctx.executable.dev_sign_bundle, ctx.executable._deapexer, - ctx.executable._java, ctx.executable._sign_apex, ctx.executable._openssl, ctx.executable._zip2zip, @@ -194,6 +195,7 @@ def _sign_bundle(ctx, aapt2, avbtool, module_name, bundle_file, apex_info): bundletool_jarfile, signapk_jar, libconscrypt_openjdk_jni_so, + java_runtime.files, ] # Inputs @@ -209,6 +211,7 @@ def _sign_bundle(ctx, aapt2, avbtool, module_name, bundle_file, apex_info): outputs = [output_dir, tmp_dir] # Arguments + java_bin = paths.join(java_runtime.java_home, "bin") args = ctx.actions.args() args.add_all(["--input_dir", input_bundle_file.dirname]) args.add_all(["--output_dir", output_dir.path]) @@ -218,7 +221,7 @@ def _sign_bundle(ctx, aapt2, avbtool, module_name, bundle_file, apex_info): args.add_all(["--deapexer_path", ctx.executable._deapexer.path]) args.add_all(["--blkid_path", ctx.executable._blkid.path]) args.add_all(["--debugfs_path", ctx.executable._debugfs.path]) - args.add_all(["--java_binary_path", ctx.executable._java.path]) + args.add_all(["--java_binary_path", paths.join(java_bin, "java")]) args.add_all(["--apex_signer_path", ctx.executable._sign_apex]) ctx.actions.run( @@ -236,7 +239,7 @@ def _sign_bundle(ctx, aapt2, avbtool, module_name, bundle_file, apex_info): ctx.executable._deapexer.dirname, avbtool.files_to_run.executable.dirname, ctx.executable._openssl.dirname, - ctx.executable._java.dirname, + java_bin, ], ), }, @@ -378,15 +381,10 @@ _apex_aab = rule( executable = True, default = "//external/erofs-utils:fsck.erofs", ), - "_java": attr.label( + "_java_runtime": attr.label( + default = Label("@bazel_tools//tools/jdk:current_java_runtime"), cfg = "exec", - executable = True, - default = "@local_jdk//:java", - ), - "_jdk_bin": attr.label( - cfg = "exec", - executable = False, - default = "@local_jdk//:jdk-bin", + providers = [java_common.JavaRuntimeInfo], ), "_libconscrypt_openjdk_jni": attr.label( cfg = "exec", |