commit 44e9f946894089e6f77c2ac0f2acd14794502b86
author Pierre-Clément Tosi <ptosi@google.com> Tue Jun 27 14:33:56 2023 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Tue Jun 27 15:03:09 2023 +0000
tree f0dcc3a06d9c3ab0938637e60d5d0d83655a861d
parent 579479e9624a6e75d45716be874c9309179a6a67

pvmfw/avb: Squash libpvmfw_avb_nostd BP module

The defaults only seem to be used by that one module so inline them.

Test: TH
Change-Id: I7d333a72b977003db70c6ec06512d92ac5a2c547

pvmfw/avb/Android.bp

diff --git a/pvmfw/avb/Android.bp b/pvmfw/avb/Android.bp
index 5353a21..49c4717 100644
--- a/pvmfw/avb/Android.bp
+++ b/pvmfw/avb/Android.bp
@@ -2,8 +2,8 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-rust_defaults {
-    name: "libpvmfw_avb_nostd_defaults",
+rust_library_rlib {
+    name: "libpvmfw_avb_nostd",
     crate_name: "pvmfw_avb",
     srcs: ["src/lib.rs"],
     prefer_rlib: true,
@@ -16,11 +16,6 @@
     whole_static_libs: [
         "libavb_baremetal",
     ],
-}
-
-rust_library_rlib {
-    name: "libpvmfw_avb_nostd",
-    defaults: ["libpvmfw_avb_nostd_defaults"],
     no_stdlibs: true,
     stdlibs: [
         "libcore.rust_sysroot",