diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-18 20:09:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-18 20:09:52 +0000 |
commit | 9287f1a3093dfe4064418ff669cf3faf676e6bde (patch) | |
tree | 3de276b597a91a41f8159bf28d07deaa18fa6d3c | |
parent | d103b091e1d1ab928b09992b430cc544ad8a0a6b (diff) | |
parent | 445382ff7200f45931625daad8b33a77780f7f7f (diff) | |
download | grpcio-9287f1a3093dfe4064418ff669cf3faf676e6bde.tar.gz |
Migrate to cargo_embargo. am: 03b74fdb2b am: 54e344b965 am: 445382ff72
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio/+/2826475
Change-Id: I2441894d5d695fd65cefe22b3268e9c91fc681e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | cargo2android.json | 12 | ||||
-rw-r--r-- | cargo_embargo.json | 17 |
3 files changed, 24 insertions, 21 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -41,15 +41,13 @@ rust_library { "libparking_lot", "libprotobuf", ], - apex_available: [ - "//apex_available:platform", - ], + apex_available: ["//apex_available:platform"], vendor_available: true, min_sdk_version: "29", cfgs: [ - // cfg(soong) is used to distinguish code that only builds on Android, so - // that (most of) the same code can be built under both Soong and cargo. - "soong", - ] - , + // cfg(soong) is used to distinguish code that only builds on Android, so + // that (most of) the same code can be built under both Soong and cargo. + "soong", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index c908dd9..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform" - ], - "device": true, - "features": "_secure,boringssl,protobufv3-codec", - "min-sdk-version": "29", - "run": true, - "vendor-available": true, - "product-available": false, - "add-module-block": "cargo2android_cfgs.bp" -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..5d8821e --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,17 @@ +{ + "apex_available": [ + "//apex_available:platform" + ], + "features": [ + "_secure", + "boringssl", + "protobufv3-codec" + ], + "min_sdk_version": "29", + "package": { + "grpcio": { + "add_module_block": "cargo2android_cfgs.bp" + } + }, + "product_available": false +} |