Add avf_build_flags_rust defaults to all rust_ modules
Bug: 298008251
Bug: 298012279
Bug: 298007909
Bug: 298008232
Test: builds
Test: presubmit
Change-Id: I5194d7043d5ac60b34162399557b3b657ead8969
diff --git a/apkdmverity/Android.bp b/apkdmverity/Android.bp
index 8429263..cc54d2e 100644
--- a/apkdmverity/Android.bp
+++ b/apkdmverity/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "apkdmverity.defaults",
crate_name: "apkdmverity",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
edition: "2021",
prefer_rlib: true,
diff --git a/authfs/Android.bp b/authfs/Android.bp
index 154a1d6..a4151c2 100644
--- a/authfs/Android.bp
+++ b/authfs/Android.bp
@@ -33,7 +33,10 @@
enabled: false,
},
},
- defaults: ["crosvm_defaults"],
+ defaults: [
+ "crosvm_defaults",
+ "avf_build_flags_rust",
+ ],
}
rust_binary {
diff --git a/authfs/fd_server/Android.bp b/authfs/fd_server/Android.bp
index db1fd44..b02c104 100644
--- a/authfs/fd_server/Android.bp
+++ b/authfs/fd_server/Android.bp
@@ -4,6 +4,7 @@
rust_binary {
name: "fd_server",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
rustlibs: [
"authfs_aidl_interface-rust",
@@ -24,6 +25,7 @@
rust_test {
name: "fd_server.test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
rustlibs: [
"authfs_aidl_interface-rust",
diff --git a/authfs/src/fsverity/metadata/Android.bp b/authfs/src/fsverity/metadata/Android.bp
index 3df7519..c874c2b 100644
--- a/authfs/src/fsverity/metadata/Android.bp
+++ b/authfs/src/fsverity/metadata/Android.bp
@@ -5,6 +5,7 @@
rust_bindgen {
name: "libauthfs_fsverity_metadata_bindgen",
wrapper_src: "metadata.hpp",
+ defaults: ["avf_build_flags_rust"],
crate_name: "authfs_fsverity_metadata_bindgen",
source_stem: "metadata_bindings",
apex_available: ["com.android.virt"],
@@ -13,6 +14,7 @@
rust_library {
name: "libauthfs_fsverity_metadata",
crate_name: "authfs_fsverity_metadata",
+ defaults: ["avf_build_flags_rust"],
srcs: [
"metadata.rs",
],
diff --git a/authfs/tests/common/Android.bp b/authfs/tests/common/Android.bp
index 01ebcfd..bba329e 100644
--- a/authfs/tests/common/Android.bp
+++ b/authfs/tests/common/Android.bp
@@ -18,6 +18,7 @@
rust_test {
name: "open_then_run",
crate_name: "open_then_run",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/open_then_run.rs"],
edition: "2021",
rustlibs: [
@@ -35,6 +36,7 @@
rust_test {
name: "open_then_run.test",
crate_name: "open_then_run",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/open_then_run.rs"],
edition: "2021",
rustlibs: [
diff --git a/compos/Android.bp b/compos/Android.bp
index 2f6be98..19123dd 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "compsvc_defaults",
edition: "2021",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/compsvc_main.rs"],
rustlibs: [
"authfs_aidl_interface-rust",
diff --git a/compos/common/Android.bp b/compos/common/Android.bp
index 05bc093..01ab7c9 100644
--- a/compos/common/Android.bp
+++ b/compos/common/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libcompos_common",
crate_name: "compos_common",
+ defaults: ["avf_build_flags_rust"],
srcs: ["lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/compos/composd/native/Android.bp b/compos/composd/native/Android.bp
index ccd8651..f35517f 100644
--- a/compos/composd/native/Android.bp
+++ b/compos/composd/native/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libcomposd_native_rust",
crate_name: "composd_native",
+ defaults: ["avf_build_flags_rust"],
srcs: ["lib.rs"],
rustlibs: [
"libanyhow",
diff --git a/compos/composd_cmd/Android.bp b/compos/composd_cmd/Android.bp
index 77caad8..4d3ed5f 100644
--- a/compos/composd_cmd/Android.bp
+++ b/compos/composd_cmd/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "composd_cmd_defaults",
srcs: ["composd_cmd.rs"],
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
rustlibs: [
"android.system.composd-rust",
diff --git a/compos/verify/Android.bp b/compos/verify/Android.bp
index 9e30b0d..f4d8695 100644
--- a/compos/verify/Android.bp
+++ b/compos/verify/Android.bp
@@ -5,6 +5,7 @@
rust_binary {
name: "compos_verify",
srcs: ["verify.rs"],
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
rustlibs: [
"compos_aidl_interface-rust",
@@ -26,6 +27,7 @@
rust_test {
name: "compos_verify.test",
srcs: ["verify.rs"],
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
rustlibs: [
"compos_aidl_interface-rust",
diff --git a/compos/verify/native/Android.bp b/compos/verify/native/Android.bp
index 969c9f4..438d93a 100644
--- a/compos/verify/native/Android.bp
+++ b/compos/verify/native/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libcompos_verify_native_rust",
crate_name: "compos_verify_native",
+ defaults: ["avf_build_flags_rust"],
srcs: ["lib.rs"],
rustlibs: [
"libanyhow",
diff --git a/libs/apexutil/Android.bp b/libs/apexutil/Android.bp
index 4a4a673..92d4e80 100644
--- a/libs/apexutil/Android.bp
+++ b/libs/apexutil/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libapexutil_rust.defaults",
crate_name: "apexutil",
+ defaults: ["avf_build_flags_rust"],
host_supported: true,
srcs: ["src/lib.rs"],
edition: "2021",
diff --git a/libs/apkverify/Android.bp b/libs/apkverify/Android.bp
index 83dbff6..d3aa7ee 100644
--- a/libs/apkverify/Android.bp
+++ b/libs/apkverify/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libapkverify.defaults",
crate_name: "apkverify",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
edition: "2021",
@@ -40,6 +41,7 @@
rust_test {
name: "libapkverify.integration_test",
crate_name: "apkverify_test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["tests/*_test.rs"],
prefer_rlib: true,
edition: "2021",
diff --git a/libs/avflog/Android.bp b/libs/avflog/Android.bp
index 1ddfc7a..695a6c6 100644
--- a/libs/avflog/Android.bp
+++ b/libs/avflog/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libavflog.defaults",
crate_name: "avflog",
+ defaults: ["avf_build_flags_rust"],
host_supported: true,
srcs: ["src/lib.rs"],
edition: "2021",
diff --git a/libs/capabilities/Android.bp b/libs/capabilities/Android.bp
index db3f4d4..55112e1 100644
--- a/libs/capabilities/Android.bp
+++ b/libs/capabilities/Android.bp
@@ -4,6 +4,7 @@
rust_bindgen {
name: "libcap_bindgen",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
wrapper_src: "bindgen/libcap.h",
crate_name: "cap_bindgen",
@@ -20,6 +21,7 @@
rust_test {
name: "libcap_bindgen_test",
srcs: [":libcap_bindgen"],
+ defaults: ["avf_build_flags_rust"],
crate_name: "cap_bindgen_test",
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -30,6 +32,7 @@
rust_defaults {
name: "libcap_rust.defaults",
crate_name: "cap",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/caps.rs"],
rustlibs: [
"libanyhow",
diff --git a/libs/devicemapper/Android.bp b/libs/devicemapper/Android.bp
index 29f2f5f..8f9c25c 100644
--- a/libs/devicemapper/Android.bp
+++ b/libs/devicemapper/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libdm_rust.defaults",
crate_name: "dm",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
edition: "2021",
prefer_rlib: true,
diff --git a/libs/fdtpci/Android.bp b/libs/fdtpci/Android.bp
index f368b08..e12c24f 100644
--- a/libs/fdtpci/Android.bp
+++ b/libs/fdtpci/Android.bp
@@ -8,6 +8,7 @@
no_stdlibs: true,
host_supported: false,
crate_name: "fdtpci",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
rustlibs: [
"liblibfdt",
diff --git a/libs/hyp/Android.bp b/libs/hyp/Android.bp
index 8baf9dd..404269a 100644
--- a/libs/hyp/Android.bp
+++ b/libs/hyp/Android.bp
@@ -5,6 +5,7 @@
rust_library_rlib {
name: "libhyp",
crate_name: "hyp",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
rustlibs: [
diff --git a/libs/libfdt/Android.bp b/libs/libfdt/Android.bp
index 0540f26..402040c 100644
--- a/libs/libfdt/Android.bp
+++ b/libs/libfdt/Android.bp
@@ -5,6 +5,7 @@
rust_bindgen {
name: "liblibfdt_bindgen",
crate_name: "libfdt_bindgen",
+ defaults: ["avf_build_flags_rust"],
wrapper_src: "bindgen/fdt.h",
source_stem: "bindings",
bindgen_flags: [
@@ -24,6 +25,7 @@
rust_library_rlib {
name: "liblibfdt",
crate_name: "libfdt",
+ defaults: ["avf_build_flags_rust"],
srcs: [
"src/lib.rs",
":liblibfdt_bindgen",
@@ -47,6 +49,7 @@
rust_test {
name: "liblibfdt.integration_test",
crate_name: "libfdt_test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["tests/*.rs"],
test_suites: ["general-tests"],
data: [
diff --git a/libs/nested_virt/Android.bp b/libs/nested_virt/Android.bp
index 72393ea..74dd38f 100644
--- a/libs/nested_virt/Android.bp
+++ b/libs/nested_virt/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libnested_virt",
crate_name: "nested_virt",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/libs/service_vm_comm/Android.bp b/libs/service_vm_comm/Android.bp
index 18397c5..cdb8fc3 100644
--- a/libs/service_vm_comm/Android.bp
+++ b/libs/service_vm_comm/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libservice_vm_comm_defaults",
crate_name: "service_vm_comm",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
apex_available: [
diff --git a/libs/statslog_virtualization/Android.bp b/libs/statslog_virtualization/Android.bp
index a702ea1..2860e6c 100644
--- a/libs/statslog_virtualization/Android.bp
+++ b/libs/statslog_virtualization/Android.bp
@@ -29,6 +29,7 @@
rust_defaults {
name: "libstatslog_virtualization_rust_defaults",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
rustlibs: [
"libstatspull_bindgen",
diff --git a/libs/vbmeta/Android.bp b/libs/vbmeta/Android.bp
index a487097..ae83703 100644
--- a/libs/vbmeta/Android.bp
+++ b/libs/vbmeta/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "libvbmeta_rust.defaults",
crate_name: "vbmeta",
+ defaults: ["avf_build_flags_rust"],
host_supported: true,
srcs: ["src/lib.rs"],
edition: "2021",
diff --git a/libs/vmconfig/Android.bp b/libs/vmconfig/Android.bp
index fe541d3..728033c 100644
--- a/libs/vmconfig/Android.bp
+++ b/libs/vmconfig/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libvmconfig",
crate_name: "vmconfig",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/microdroid/init_debug_policy/Android.bp b/microdroid/init_debug_policy/Android.bp
index afc2e73..ed017e5 100644
--- a/microdroid/init_debug_policy/Android.bp
+++ b/microdroid/init_debug_policy/Android.bp
@@ -4,6 +4,7 @@
rust_binary {
name: "microdroid_init_debug_policy",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/init_debug_policy.rs"],
stem: "init_debug_policy",
rustlibs: [
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index 699a28a..de28d8a 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -4,6 +4,7 @@
rust_binary_host {
name: "initrd_bootconfig",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
rustlibs: [
"libanyhow",
@@ -14,6 +15,7 @@
rust_test_host {
name: "initrd_bootconfig.test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
rustlibs: [
"libanyhow",
diff --git a/microdroid/payload/config/Android.bp b/microdroid/payload/config/Android.bp
index 7e60cd4..4c72b97 100644
--- a/microdroid/payload/config/Android.bp
+++ b/microdroid/payload/config/Android.bp
@@ -6,6 +6,7 @@
name: "libmicrodroid_payload_config",
host_supported: true,
crate_name: "microdroid_payload_config",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
edition: "2021",
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index fe0cf6a..c91519c 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "microdroid_manager_defaults",
crate_name: "microdroid_manager",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
edition: "2021",
prefer_rlib: true,
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 1aa5935..523334f 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -48,6 +48,7 @@
host_supported: true,
// For now, only bootargs.rs is written to be conditionally compiled with std.
srcs: ["src/bootargs.rs"],
+ defaults: ["avf_build_flags_rust"],
test_suites: ["general-tests"],
test_options: {
unit_test: true,
diff --git a/pvmfw/avb/Android.bp b/pvmfw/avb/Android.bp
index 6c1bdd1..73d188b 100644
--- a/pvmfw/avb/Android.bp
+++ b/pvmfw/avb/Android.bp
@@ -5,6 +5,7 @@
rust_library_rlib {
name: "libpvmfw_avb_nostd",
crate_name: "pvmfw_avb",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
rustlibs: [
@@ -24,6 +25,7 @@
rust_test {
name: "libpvmfw_avb.integration_test",
crate_name: "pvmfw_avb_test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["tests/*.rs"],
test_suites: ["general-tests"],
data: [
diff --git a/rialto/Android.bp b/rialto/Android.bp
index 55423ea..3dfcca1 100644
--- a/rialto/Android.bp
+++ b/rialto/Android.bp
@@ -95,6 +95,7 @@
rust_test {
name: "rialto_test",
crate_name: "rialto_test",
+ defaults: ["avf_build_flags_rust"],
srcs: ["tests/test.rs"],
prefer_rlib: true,
edition: "2021",
diff --git a/service_vm/client_apk/Android.bp b/service_vm/client_apk/Android.bp
index 415b563..d94489d 100644
--- a/service_vm/client_apk/Android.bp
+++ b/service_vm/client_apk/Android.bp
@@ -16,6 +16,7 @@
rust_defaults {
name: "service_vm_client_defaults",
crate_name: "service_vm_client",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
prefer_rlib: true,
rustlibs: [
diff --git a/virtualizationmanager/Android.bp b/virtualizationmanager/Android.bp
index de39aa2..c660414 100644
--- a/virtualizationmanager/Android.bp
+++ b/virtualizationmanager/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "virtualizationmanager_defaults",
crate_name: "virtualizationmanager",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
// Only build on targets which crosvm builds on.
enabled: false,
diff --git a/virtualizationservice/Android.bp b/virtualizationservice/Android.bp
index f96c76b..74f88c5 100644
--- a/virtualizationservice/Android.bp
+++ b/virtualizationservice/Android.bp
@@ -5,6 +5,7 @@
rust_binary {
name: "virtualizationservice",
crate_name: "virtualizationservice",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
srcs: ["src/main.rs"],
// Only build on targets which crosvm builds on.
diff --git a/virtualizationservice/vfio_handler/Android.bp b/virtualizationservice/vfio_handler/Android.bp
index 66662d5..66fc2ee 100644
--- a/virtualizationservice/vfio_handler/Android.bp
+++ b/virtualizationservice/vfio_handler/Android.bp
@@ -5,6 +5,7 @@
rust_binary {
name: "vfio_handler",
crate_name: "vfio_handler",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
srcs: ["src/main.rs"],
// Only build on targets which crosvm builds on.
diff --git a/vm/Android.bp b/vm/Android.bp
index 50e68cc..04aff5e 100644
--- a/vm/Android.bp
+++ b/vm/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "vm.defaults",
crate_name: "vm",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
edition: "2021",
prefer_rlib: true,
diff --git a/vm_payload/Android.bp b/vm_payload/Android.bp
index 49b7f5f..d2ac7ee 100644
--- a/vm_payload/Android.bp
+++ b/vm_payload/Android.bp
@@ -6,6 +6,7 @@
rust_ffi_static {
name: "libvm_payload_impl",
crate_name: "vm_payload",
+ defaults: ["avf_build_flags_rust"],
visibility: ["//visibility:private"],
srcs: ["src/*.rs"],
include_dirs: ["include"],
@@ -29,6 +30,7 @@
name: "libvm_payload_bindgen",
wrapper_src: "include-restricted/vm_payload_restricted.h",
crate_name: "vm_payload_bindgen",
+ defaults: ["avf_build_flags_rust"],
source_stem: "bindings",
apex_available: ["com.android.compos"],
visibility: [
diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index 71b9e76..b2b1549 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -15,6 +15,7 @@
// Used by intermediate rust_library_rlib for vmbase-based binaries.
rust_defaults {
name: "vmbase_rlib_defaults",
+ defaults: ["avf_build_flags_rust"],
edition: "2021",
prefer_rlib: true,
host_supported: false,
diff --git a/vmclient/Android.bp b/vmclient/Android.bp
index 8517c88..96fe667 100644
--- a/vmclient/Android.bp
+++ b/vmclient/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libvmclient",
crate_name: "vmclient",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/zipfuse/Android.bp b/zipfuse/Android.bp
index 1bdc5fe..974d66a 100644
--- a/zipfuse/Android.bp
+++ b/zipfuse/Android.bp
@@ -5,6 +5,7 @@
rust_defaults {
name: "zipfuse.defaults",
crate_name: "zipfuse",
+ defaults: ["avf_build_flags_rust"],
srcs: ["src/main.rs"],
edition: "2021",
prefer_rlib: true,