commit f849048aa7b2f315566f5662479bad2a13cf47ca
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 12 03:56:28 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 03:56:28 2025 -0800
tree 909508eff670c92e8c08f7ff933dd0711a1e403e
parent 3941786c939bb2386b60b7e21dfa4f83df9c437c
parent d7da915ee277cb24c0042f968da7a9974daeb76d

Merge "guest: trusty: security_vm: vm: fix the removal of static_libs" into main am: d7da915ee2

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

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

guest/trusty/security_vm/vm/Android.bp

diff --git a/guest/trusty/security_vm/vm/Android.bp b/guest/trusty/security_vm/vm/Android.bp
index d823448..a348699 100644
--- a/guest/trusty/security_vm/vm/Android.bp
+++ b/guest/trusty/security_vm/vm/Android.bp
@@ -95,6 +95,7 @@
         ":security_vm.S",
     ],
     crt: false,
+    static_libs: ["trusty_security_vm_signed_bin"],
     system_shared_libs: [],
     visibility: ["//visibility:private"],
     enabled: select((os(), arch(), soong_config_variable("trusty_system_vm", "enabled")), {

guest/trusty/test_vm/vm/Android.bp

diff --git a/guest/trusty/test_vm/vm/Android.bp b/guest/trusty/test_vm/vm/Android.bp
index 1db9078..4f696b1 100644
--- a/guest/trusty/test_vm/vm/Android.bp
+++ b/guest/trusty/test_vm/vm/Android.bp
@@ -78,6 +78,7 @@
         ":test_vm.S",
     ],
     crt: false,
+    static_libs: ["trusty_test_vm_signed_bin"],
     system_shared_libs: [],
     enabled: false,
     target: {