commit f71e6eece2e09e332aea4d0cc97c2b80ae4212f2
author Andrew Walbran <qwandor@google.com> Fri Apr 22 14:04:27 2022 +0000
committer Andrew Walbran <qwandor@google.com> Thu May 05 15:51:46 2022 +0000
tree 66396bd23b6a229d8d1c445ad0f8756cafaae3dd
parent e025b029d35de5a624a466ff9f8dc5209a7b3f1c

Move entry point and exception vector to library.

Bug: 223166344
Test: Ran unprotected VM under crosvm.
Change-Id: Id0189800ff9fc896989c838e3b30d88494e99cd5

pvmfw/Android.bp

diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 3b5df7f..c855b34 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -27,12 +27,11 @@
 cc_binary {
     name: "pvmfw",
     srcs: [
-        "entry.S",
-        "exceptions.S",
         "idmap.S",
     ],
     static_libs: [
         "libpvmfw",
+        "libvmbase_entry",
     ],
     static_executable: true,
     nocrt: true,

vmbase/Android.bp

diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index 972cd1b..c335bda 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -16,3 +16,22 @@
     },
     apex_available: ["com.android.virt"],
 }
+
+cc_library_static {
+    name: "libvmbase_entry",
+    srcs: [
+        "entry.S",
+        "exceptions.S",
+    ],
+    nocrt: true,
+    no_libcrt: true,
+    system_shared_libs: [],
+    stl: "none",
+    enabled: false,
+    target: {
+        android_arm64: {
+            enabled: true,
+        },
+    },
+    apex_available: ["com.android.virt"],
+}

vmbase/entry.S

diff --git a/pvmfw/entry.S b/vmbase/entry.S
similarity index 100%
rename from pvmfw/entry.S
rename to vmbase/entry.S

vmbase/exceptions.S

diff --git a/pvmfw/exceptions.S b/vmbase/exceptions.S
similarity index 100%
rename from pvmfw/exceptions.S
rename to vmbase/exceptions.S