commit d3db5d9a484c6eb69461e9076d9817c41950ab82
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 31 09:24:37 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 31 09:24:37 2024 +0000
tree 79d32567ef282e9a00d5fa64015d5fe021560bd1
parent a5021035e8aa365021f36568136d8427648540d6
parent 6b0c488aea12c8ec68d72c0f311988e0fd414c81

Merge "pvmfw: Make pvmfw_embedded_key a proper PEM file" into main am: a4971bd0a8 am: 6b0c488aea

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3103177

Change-Id: Icb03e322b9d206946e675b73a05abc67f74390e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

pvmfw/Android.bp

diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 769a955..66b34a6 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -320,15 +320,22 @@
     installable: false,
 }
 
-prebuilt_etc {
+filegroup {
     name: "pvmfw_embedded_key",
-    src: ":avb_testkey_rsa4096_pub_bin",
-    installable: false,
+    srcs: [":avb_testkey_rsa4096"],
+}
+
+genrule {
+    name: "pvmfw_embedded_key_pub_bin",
+    tools: ["avbtool"],
+    srcs: [":pvmfw_embedded_key"],
+    out: ["pvmfw_embedded_key_pub.bin"],
+    cmd: "$(location avbtool) extract_public_key --key $(in) --output $(out)",
 }
 
 genrule {
     name: "pvmfw_embedded_key_rs",
-    srcs: [":pvmfw_embedded_key"],
+    srcs: [":pvmfw_embedded_key_pub_bin"],
     out: ["lib.rs"],
     cmd: "(" +
         "    echo '#![no_std]';" +