Move kernel hash extraction scripts to microdroid
Test: atest rialto_test
Bug: 326363997
Change-Id: Iecc53ef6cfecc8b2a89290b1d469a2940000c27e
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 233754a..5940835 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -599,3 +599,37 @@
defaults: ["microdroid_initrd_debug_defaults"],
src: ":microdroid_gki-android14-6.1_initrd_debuggable",
}
+
+python_binary_host {
+ name: "extract_microdroid_kernel_hashes",
+ srcs: ["extract_microdroid_kernel_hashes.py"],
+}
+
+genrule {
+ name: "microdroid_kernel_hashes_rs",
+ srcs: [
+ ":microdroid_kernel",
+ ":microdroid_gki-android14-6.1_kernel",
+ ],
+ out: ["lib.rs"],
+ tools: [
+ "extract_microdroid_kernel_hashes",
+ "avbtool",
+ ],
+ cmd: "$(location extract_microdroid_kernel_hashes) --avbtool $(location avbtool) " +
+ "--kernel $(location :microdroid_kernel) " +
+ "$(location :microdroid_gki-android14-6.1_kernel) " +
+ "> $(out)",
+}
+
+rust_library_rlib {
+ name: "libmicrodroid_kernel_hashes",
+ srcs: [":microdroid_kernel_hashes_rs"],
+ crate_name: "microdroid_kernel_hashes",
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+}
diff --git a/service_vm/kernel/extract_microdroid_kernel_hashes.py b/microdroid/extract_microdroid_kernel_hashes.py
similarity index 100%
rename from service_vm/kernel/extract_microdroid_kernel_hashes.py
rename to microdroid/extract_microdroid_kernel_hashes.py
diff --git a/service_vm/kernel/Android.bp b/service_vm/kernel/Android.bp
deleted file mode 100644
index fbfed8e..0000000
--- a/service_vm/kernel/Android.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-python_binary_host {
- name: "extract_microdroid_kernel_hashes",
- srcs: ["extract_microdroid_kernel_hashes.py"],
-}
-
-genrule {
- name: "microdroid_kernel_hashes_rs",
- srcs: [
- ":microdroid_kernel",
- ":microdroid_gki-android14-6.1_kernel",
- ],
- out: ["lib.rs"],
- tools: [
- "extract_microdroid_kernel_hashes",
- "avbtool",
- ],
- cmd: "$(location extract_microdroid_kernel_hashes) --avbtool $(location avbtool) " +
- "--kernel $(location :microdroid_kernel) " +
- "$(location :microdroid_gki-android14-6.1_kernel) " +
- "> $(out)",
-}
-
-rust_library_rlib {
- name: "libmicrodroid_kernel_hashes",
- srcs: [":microdroid_kernel_hashes_rs"],
- crate_name: "microdroid_kernel_hashes",
- prefer_rlib: true,
- no_stdlibs: true,
- stdlibs: [
- "libcompiler_builtins.rust_sysroot",
- "libcore.rust_sysroot",
- ],
-}