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,
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"],
+}
diff --git a/pvmfw/entry.S b/vmbase/entry.S
similarity index 100%
rename from pvmfw/entry.S
rename to vmbase/entry.S
diff --git a/pvmfw/exceptions.S b/vmbase/exceptions.S
similarity index 100%
rename from pvmfw/exceptions.S
rename to vmbase/exceptions.S