vmbase: Keep base target names for ELF not bin
Rename the targets to be more consistent:
- m pvmfw -> builds pvmfw
- m pvmfw_bin -> builds pvmfw.bin
- m pvmfw_img -> builds pvmfw.img
Test: TH
Change-Id: I3eaea21609166409c7b5bfe3aa9122c32b229521
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index eab9474..5bcafd5 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -15,8 +15,7 @@
}
cc_binary {
- name: "pvmfw_elf",
- stem: "pvmfw",
+ name: "pvmfw",
defaults: ["vmbase_elf_defaults"],
srcs: [
"idmap.S",
@@ -33,8 +32,9 @@
}
raw_binary {
- name: "pvmfw",
- src: ":pvmfw_elf",
+ name: "pvmfw_bin",
+ stem: "pvmfw.bin",
+ src: ":pvmfw",
enabled: false,
target: {
android_arm64: {
diff --git a/vmbase/example/Android.bp b/vmbase/example/Android.bp
index e11bb2f..4e62090 100644
--- a/vmbase/example/Android.bp
+++ b/vmbase/example/Android.bp
@@ -18,8 +18,7 @@
}
cc_binary {
- name: "vmbase_example_elf",
- stem: "vmbase_example",
+ name: "vmbase_example",
defaults: ["vmbase_elf_defaults"],
srcs: [
"idmap.S",
@@ -35,8 +34,9 @@
}
raw_binary {
- name: "vmbase_example",
- src: ":vmbase_example_elf",
+ name: "vmbase_example_bin",
+ stem: "vmbase_example.bin",
+ src: ":vmbase_example",
enabled: false,
target: {
android_arm64: {
@@ -60,7 +60,7 @@
"libvmclient",
],
data: [
- ":vmbase_example",
+ ":vmbase_example_bin",
],
test_suites: ["general-tests"],
enabled: false,