diff options
| author | Yiming Jing <yimingjing@google.com> | 2023-10-17 23:17:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-17 23:17:04 +0000 |
| commit | ce493d22f0c8e4e3202b72f6b274ee425ebc8cc3 (patch) | |
| tree | 9588de2d2ea55d69e6f382d5d3fce51541d3c728 | |
| parent | d7f22c6ff6a56eecb306a5c4e11ff11f41e356d9 (diff) | |
| parent | 9373479334615d76ed1749510322acd3cefe046b (diff) | |
| download | grpcio-sys-ce493d22f0c8e4e3202b72f6b274ee425ebc8cc3.tar.gz | |
Merge "Make grpcio-sys available to vendor" into main am: 9373479334
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/2767975
Change-Id: If34d4c3df184798a7a84ac41985717dec112db84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -63,6 +63,8 @@ rust_library { "//apex_available:platform", "com.android.btservices", ], + product_available: false, + vendor_available: true, min_sdk_version: "29", } @@ -74,9 +76,12 @@ cc_defaults { cpp_std: "c++11", shared_libs: ["libgrpc++"], apex_available: [ + "//apex_available:anyapex", "//apex_available:platform", "com.android.btservices", ], + product_available: false, + vendor_available: true, min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json index 64c04608..f46ea87d 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -9,5 +9,7 @@ "min-sdk-version": "29", "no-pkg-vers": true, "patch": "patches/Android.bp.patch", - "run": true + "run": true, + "vendor-available": true, + "product-available": false } |