summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 18:24:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 18:24:08 +0000
commitb6a0dfcdb9a787f89e2b3cbcd23e512da176a2f6 (patch)
tree9f27fcf3497ae40a580dbac126708d035a14a4aa
parentbbc53266b12c82c9b1693644bb411174f2e3dd79 (diff)
parentf78d645463257895749f7e976f7673b352d9c431 (diff)
downloadgrpcio-compiler-b6a0dfcdb9a787f89e2b3cbcd23e512da176a2f6.tar.gz
Migrate to cargo_embargo. am: f78d645463
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-compiler/+/2832422 Change-Id: I7fa22fe9fabfe0c4532ffea78af27c86d3a83984 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp26
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json11
3 files changed, 33 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 3b8f2de..576d217 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -51,6 +51,26 @@ rust_binary_host {
],
}
+rust_test_host {
+ name: "grpcio-compiler_test_src_lib",
+ crate_name: "grpcio_compiler",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.12.1",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2018",
+ features: [
+ "default",
+ "protobuf",
+ "protobuf-codec",
+ ],
+ rustlibs: ["libprotobuf_deprecated"],
+}
+
rust_library_host {
name: "libgrpcio_compiler",
crate_name: "grpcio_compiler",
@@ -63,7 +83,5 @@ rust_library_host {
"protobuf",
"protobuf-codec",
],
- rustlibs: [
- "libprotobuf_deprecated",
- ],
+ rustlibs: ["libprotobuf_deprecated"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index fe5cae7..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "dependencies": true,
- "run": true,
- "tests": true,
- "dep-suffixes": {
- "protobuf": "_deprecated"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d5ca5c7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "module_name_overrides": {
+ "libprotobuf": "libprotobuf_deprecated"
+ },
+ "package": {
+ "grpcio-compiler": {
+ "device_supported": false
+ }
+ },
+ "tests": true
+}