From ebc21200302c3600a11ba644fd677fdc70133b9e Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Tue, 21 Nov 2023 16:46:08 +0000
Subject: Use extra_cfg rather than add_module_block.

Test: Ran cargo_embargo, compared Android.bp.
Change-Id: Iafb55c7a8bc26bc3c684b8c15fb9456c99d85576
---
 Android.bp         | 32 ++++++++++++++++----------------
 cargo_embargo.json |  2 +-
 cfg_soong.bp       |  1 -
 3 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 cfg_soong.bp

diff --git a/Android.bp b/Android.bp
index f1ae06f..1ec8356 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,6 +49,7 @@ rust_library {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -66,7 +67,6 @@ rust_library {
     product_available: true,
     vendor_available: true,
     min_sdk_version: "29",
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -89,6 +89,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -99,7 +100,6 @@ rust_test {
         "libring-core",
         "libring-test",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -122,6 +122,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -129,7 +130,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -152,6 +152,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -159,7 +160,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -182,6 +182,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -189,7 +190,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -212,6 +212,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -219,7 +220,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -242,6 +242,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -249,7 +250,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -272,6 +272,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -279,7 +280,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -302,6 +302,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -309,7 +310,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -332,6 +332,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -339,7 +340,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -362,6 +362,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -369,7 +370,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -392,6 +392,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -399,7 +400,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -422,6 +422,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -429,7 +430,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -452,6 +452,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -459,7 +460,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_test {
@@ -482,6 +482,7 @@ rust_test {
         "once_cell",
         "std",
     ],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -489,7 +490,6 @@ rust_test {
         "libspin",
         "libuntrusted",
     ],
-    cfgs: ["soong"],
 }
 
 rust_library_rlib {
@@ -500,6 +500,7 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["once_cell"],
+    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -523,7 +524,6 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     min_sdk_version: "29",
-    cfgs: ["soong"],
 }
 
 cc_library_static {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 39fd8d0..bc68e9c 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -3,10 +3,10 @@
     "//apex_available:platform",
     "com.android.resolv"
   ],
+  "extra_cfg": ["soong"],
   "min_sdk_version": "29",
   "package": {
     "ring": {
-      "add_module_block": "cfg_soong.bp",
       "add_toplevel_block": "cargo2android_cc.bp",
       "whole_static_libs": [
         "libring-core",
diff --git a/cfg_soong.bp b/cfg_soong.bp
deleted file mode 100644
index 83a9214..0000000
--- a/cfg_soong.bp
+++ /dev/null
@@ -1 +0,0 @@
-cfgs: ["soong"]
\ No newline at end of file
-- 
cgit v1.2.3