aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiming Jing <yimingjing@google.com>2023-10-18 00:39:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 00:39:23 +0000
commit7c0976544b15caaae5c3d69b621e67021b480ce7 (patch)
tree0641aed6b8302665ad7f95d500eb372d356479f1
parenta042a197c06c43628e62dddf1f0b48d2fdd96232 (diff)
parent1e6785177a4326f8b0e2eabebdb0e9ea369c620d (diff)
downloadgrpcio-7c0976544b15caaae5c3d69b621e67021b480ce7.tar.gz
Merge "Make grpcio available to vendor" into main am: 17e8ae334b am: e2bb940c45 am: 1e6785177a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio/+/2768153 Change-Id: I91b7f52c99e2057d6719d3f103d35e4aa1f62b16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json2
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 3f136b9..66a47a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,5 +42,7 @@ rust_library {
apex_available: [
"//apex_available:platform",
],
+ product_available: false,
+ vendor_available: true,
min_sdk_version: "29",
}
diff --git a/cargo2android.json b/cargo2android.json
index c1b03ca..7721876 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,7 +6,7 @@
"features": "protobuf,protobuf-codec",
"min-sdk-version": "29",
"run": true,
- "vendor-available": false,
+ "vendor-available": true,
"product-available": false,
"dep-suffixes": {
"protobuf": "_deprecated"