commit a4971bd0a8f5ea500aaf0fd48e2636df8f828ad0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 31 09:09:32 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 31 09:09:32 2024 +0000
tree 9d068be2fe9e1e46bd48f43f17ac5f319e13cd1d
parent 6c6535d07ef6be7f4957640cc627bac599d12bce
parent 8b5533d7b659de7c1468c74f26cb193748063785

Merge "pvmfw: Make pvmfw_embedded_key a proper PEM file" into main

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]';" +