Merge "[pvmfw][microdroid] Make empty_file filegroup for reuse"
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index ff6314b..22a06e1 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -107,7 +107,7 @@
prebuilt_etc {
name: "microdroid_initrd_debuggable",
// We don't have ramdisk for architectures other than x86_64 & arm64
- src: "empty_file",
+ src: ":empty_file",
arch: {
x86_64: {
src: ":microdroid_initrd_debuggable_x86_64",
@@ -122,7 +122,7 @@
prebuilt_etc {
name: "microdroid_initrd_normal",
// We don't have ramdisk for architectures other than x86_64 & arm64
- src: "empty_file",
+ src: ":empty_file",
arch: {
x86_64: {
src: ":microdroid_initrd_normal_x86_64",
diff --git a/microdroid/initrd/empty_file b/microdroid/initrd/empty_file
deleted file mode 100644
index e69de29..0000000
--- a/microdroid/initrd/empty_file
+++ /dev/null
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 4254ecc..6d5226a 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -33,6 +33,13 @@
],
}
+// Generates an empty file.
+genrule {
+ name: "empty_file",
+ out: ["empty_file"],
+ cmd: "touch $(out)",
+}
+
cc_binary {
name: "pvmfw",
defaults: ["vmbase_elf_defaults"],
@@ -82,7 +89,7 @@
src: ":pvmfw_bin",
},
},
- src: "empty_file",
+ src: ":empty_file",
installable: false,
}
diff --git a/pvmfw/empty_file b/pvmfw/empty_file
deleted file mode 100644
index e69de29..0000000
--- a/pvmfw/empty_file
+++ /dev/null