summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:06 +0000
commite580e877f1a8cd2596bbfc1d124914b39e85ab2e (patch)
treed026d216bb5dd8d6673a7ad3fdc0c69058cf81ab
parent8a252f02e9d7c8e3a027d57c49fefbbbb001a6e0 (diff)
parent33a9c5dce770c01471e4b80db28fcf1889650508 (diff)
downloadgrpcio-compiler-e580e877f1a8cd2596bbfc1d124914b39e85ab2e.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 777d7ee8d2 am: e5e231eb80 am: 33a9c5dce7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-compiler/+/1912692 Change-Id: I49c25115c3f8cf6d3c536ed11d52c26855ac0b15
-rw-r--r--Android.bp45
-rw-r--r--cargo2android.json2
2 files changed, 1 insertions, 46 deletions
diff --git a/Android.bp b/Android.bp
index 678c541..fb52b72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,51 +51,6 @@ rust_binary_host {
],
}
-rust_test_host {
- name: "grpcio-compiler_host_test_src_bin_grpc_rust_plugin",
- crate_name: "grpc_rust_plugin",
- cargo_env_compat: true,
- cargo_pkg_version: "0.9.0",
- srcs: ["src/bin/grpc_rust_plugin.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2018",
- features: [
- "default",
- "protobuf",
- "protobuf-codec",
- ],
- rustlibs: [
- "libgrpcio_compiler",
- "libprotobuf",
- ],
-}
-
-rust_test_host {
- name: "grpcio-compiler_host_test_src_lib",
- crate_name: "grpcio_compiler",
- cargo_env_compat: true,
- cargo_pkg_version: "0.9.0",
- 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",
- ],
-}
-
rust_library_host {
name: "libgrpcio_compiler",
crate_name: "grpcio_compiler",
diff --git a/cargo2android.json b/cargo2android.json
index b7093f4..9b0d064 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,4 +2,4 @@
"dependencies": true,
"run": true,
"tests": true
-}
+} \ No newline at end of file