commit da1b273f4c8f0aa2a26649a0100d1676f6a36f0d
author Nikita Ioffe <ioffe@google.com> Mon Sep 04 13:46:56 2023 +0100
committer Nikita Ioffe <ioffe@google.com> Mon Sep 04 14:52:23 2023 +0100
tree ddc2027e08e4aaff433820afe5cf96e6fb875e3c
parent 78a299ff000233d3e33c7d6cb608a9929be7872a

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

authfs/Android.bp

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 {

authfs/fd_server/Android.bp

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",

authfs/src/fsverity/metadata/Android.bp

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",
     ],

authfs/tests/common/Android.bp

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: [