diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-24 15:41:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-24 15:41:55 +0000 |
| commit | 00a7f6b0f7ff022bce63e1a5e754200882dd3782 (patch) | |
| tree | f773466316b489aae75734c71b0d2da64dca4fda | |
| parent | f622a66b5595506b07b13c0e1b99b6176e1bcd32 (diff) | |
| parent | de7434b40567cba81ffe5d495946583d926d3f4b (diff) | |
| download | ring-00a7f6b0f7ff022bce63e1a5e754200882dd3782.tar.gz | |
Merge "Use extra_cfg rather than add_module_block." into main am: de7434b405
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/2841614
Change-Id: I8d653ec2b40c15bbe30db0c2d76ddfd5d901cbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 32 | ||||
| -rw-r--r-- | cargo_embargo.json | 2 | ||||
| -rw-r--r-- | cfg_soong.bp | 1 |
3 files changed, 17 insertions, 18 deletions
@@ -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 |