summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiming Jing <yimingjing@google.com>2023-10-17 22:40:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-10-17 22:40:07 +0000
commit9373479334615d76ed1749510322acd3cefe046b (patch)
tree9588de2d2ea55d69e6f382d5d3fce51541d3c728
parente1314493db19c82c928b064b23d5371b7a11bc45 (diff)
parent8c4194d933582b76b53dd055c4f134734309a6cd (diff)
downloadgrpcio-sys-9373479334615d76ed1749510322acd3cefe046b.tar.gz
Merge "Make grpcio-sys available to vendor" into main
-rw-r--r--Android.bp5
-rw-r--r--cargo2android.json4
2 files changed, 8 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 364cb226..3549944b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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
}