commit b4e780be40ec123d76301a611211768c61677cae
author Alice Wang <aliceywang@google.com> Mon Nov 18 08:44:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 18 08:44:25 2024 +0000
tree b713a595f75ee144201ca52a2f408dbcddc322c7
parent e633c5e456180ad4261b7ba9f0aa1a0a3e618e84
parent b4b97896f289de88b0d8a47de0b96a597dc5ab25

Merge "[KM-VM] Add arm64 KM VM kernel targets" into main am: b4b97896f2

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

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

guest/trusty/security_vm/launcher/Android.bp

diff --git a/guest/trusty/security_vm/launcher/Android.bp b/guest/trusty/security_vm/launcher/Android.bp
index ef32740..c90d893 100644
--- a/guest/trusty/security_vm/launcher/Android.bp
+++ b/guest/trusty/security_vm/launcher/Android.bp
@@ -28,6 +28,10 @@
         x86_64: {
             src: ":trusty_security_vm_signed",
         },
+        arm64: {
+            src: ":trusty-test-lk.elf",
+            enabled: true,
+        },
     },
     src: ":empty_file",
 }
@@ -56,5 +60,9 @@
             src: ":trusty-test-lk.elf",
             enabled: true,
         },
+        arm64: {
+            src: ":trusty-test-lk.elf",
+            enabled: true,
+        },
     },
 }