commit efe7e14950d8de6ef99d41e0fa1b9cc49871e572
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 06 15:48:03 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 06 15:48:03 2022 +0000
tree a0322d18faf39d4e209bfcb45a731be697dec2f6
parent 28744f36b3165e836c1f836026dfd03a4503016a
parent f71e6eece2e09e332aea4d0cc97c2b80ae4212f2

Merge "Move entry point and exception vector to library."

pvmfw/Android.bp

diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index c855b34..3e45454 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -25,7 +25,8 @@
 }
 
 cc_binary {
-    name: "pvmfw",
+    name: "pvmfw_elf",
+    stem: "pvmfw",
     srcs: [
         "idmap.S",
     ],
@@ -46,3 +47,15 @@
     },
     apex_available: ["com.android.virt"],
 }
+
+raw_binary {
+    name: "pvmfw",
+    src: ":pvmfw_elf",
+    stem: "pvmfw.bin",
+    enabled: false,
+    target: {
+        android_arm64: {
+            enabled: true,
+        },
+    },
+}

vmbase/Android.bp

diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index c335bda..473103e 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 rust_library_rlib {
     name: "libvmbase",
     host_supported: false,