Merge "Add product_available" into main am: 346b0bb5a1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/3072202
Change-Id: I5560c3a8ee263e870b4a1d747c038a15ee7f06d0
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 1521c69..be6fa61 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,6 +62,7 @@
"//apex_available:platform",
"com.android.btservices",
],
+ product_available: true,
vendor_available: true,
min_sdk_version: "29",
shared_libs: [
@@ -82,7 +83,7 @@
"//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 b5f81d5..cfc02b5 100644
--- a/cargo2android-extra-module.bp
+++ b/cargo2android-extra-module.bp
@@ -9,7 +9,7 @@
"//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 7d40f06..c3bb051 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -74,6 +74,5 @@
"patch": "patches/Android.bp.patch"
}
},
- "product_available": false,
"run_cargo": false
}
