summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Putikhin <nputikhin@google.com>2024-05-02 17:08:43 +0200
committerNikita Putikhin <nputikhin@google.com>2024-05-02 17:08:43 +0200
commitcdf6ff2556658e0836cded89bb65c4724011e1e9 (patch)
tree8fdce49c90d091119f3989cc438380073a0e8f3e
parent17d43d5b2b5d958281ca7d10e2de26dee2170f50 (diff)
downloadgrpcio-sys-cdf6ff2556658e0836cded89bb65c4724011e1e9.tar.gz
Add product_available
Vendors already can use these targets on /vendor. This change makes them available to /product as well. More about product partitions: https://source.android.com/docs/core/architecture/partitions/product-partitions Bug: 336989719 Test: mm Change-Id: I2100d547de0f9fd075f1db14c517f593df307b20
-rw-r--r--Android.bp7
-rw-r--r--cargo2android-extra-module.bp2
-rw-r--r--cargo_embargo.json1
3 files changed, 6 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index fff17c9c..679655e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
// This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: ["external_rust_crates_grpcio-sys_license"],
@@ -61,6 +63,7 @@ rust_library {
"//apex_available:platform",
"com.android.btservices",
],
+ product_available: true,
vendor_available: true,
min_sdk_version: "29",
shared_libs: [
@@ -81,7 +84,7 @@ cc_defaults {
"//apex_available:platform",
"com.android.btservices",
],
- product_available: false,
+ product_available: true,
vendor_available: true,
min_sdk_version: "29",
}
diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp
index b5f81d55..cfc02b56 100644
--- a/cargo2android-extra-module.bp
+++ b/cargo2android-extra-module.bp
@@ -9,7 +9,7 @@ cc_defaults {
"//apex_available:platform",
"com.android.btservices",
],
- product_available: false,
+ product_available: true,
vendor_available: true,
min_sdk_version: "29",
}
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 777bea33..42f98093 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -74,6 +74,5 @@
"patch": "patches/Android.bp.patch"
}
},
- "product_available": false,
"run_cargo": false
}