From e7f56774f4a1fad4881c797776bacd9f6b193b7c Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 3 May 2024 16:21:39 +0100
Subject: Manually adding soong cfg is no longer necessary.

Since https://r.android.com/3066423 Soong sets it automatically.

Test: m libring
Change-Id: Ic2f8f91e68788b70900318c12c6734327aedb1f5
---
 Android.bp         | 20 +++-----------------
 cargo_embargo.json |  1 -
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Android.bp b/Android.bp
index 1ec8356..7dca2e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 // This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
 
 package {
     default_applicable_licenses: ["external_rust_crates_ring_license"],
@@ -49,7 +51,6 @@ rust_library {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -89,7 +90,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -122,7 +122,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -152,7 +151,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -182,7 +180,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -212,7 +209,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -242,7 +238,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -272,7 +267,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -302,7 +296,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -332,7 +325,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -362,7 +354,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -392,7 +383,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -422,7 +412,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -452,7 +441,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -482,7 +470,6 @@ rust_test {
         "once_cell",
         "std",
     ],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
@@ -500,7 +487,6 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["once_cell"],
-    cfgs: ["soong"],
     rustlibs: [
         "liblibc",
         "libonce_cell",
diff --git a/cargo_embargo.json b/cargo_embargo.json
index bc68e9c..3bbd74e 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -3,7 +3,6 @@
     "//apex_available:platform",
     "com.android.resolv"
   ],
-  "extra_cfg": ["soong"],
   "min_sdk_version": "29",
   "package": {
     "ring": {
-- 
cgit v1.2.3