Configure Trusty VM as non-secure on Cuttlefish am: 8e745f1fdf Original change: https://android-review.googlesource.com/c/trusty/device/x86/generic-x86_64/+/3304727 Change-Id: I4b8d7d6ba1fdb57498f174bc8a1e43de5166b446 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/project/generic-x86_64-inc.mk b/project/generic-x86_64-inc.mk index c02e239..bce0606 100644 --- a/project/generic-x86_64-inc.mk +++ b/project/generic-x86_64-inc.mk
@@ -50,6 +50,9 @@ # Enable Secure Storage AIDL interface STORAGE_AIDL_ENABLED ?= true +# Non-secure KeyMint Trusty VM is used on x86_64 / cuttlefish +KEYMINT_TRUSTY_VM ?= nonsecure + MODULES += \ trusty/kernel/lib/trusty \ trusty/kernel/services/apploader \