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

compos/Android.bp

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

compos/common/Android.bp

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

compos/composd/native/Android.bp

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

compos/composd_cmd/Android.bp

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

compos/verify/Android.bp

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

compos/verify/native/Android.bp

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