From f78d645463257895749f7e976f7673b352d9c431 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 13:33:16 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I1dbf39f02ef6f0823c2bdd8616a3d98a663a9e35 --- Android.bp | 26 ++++++++++++++++++++++---- cargo2android.json | 8 -------- cargo_embargo.json | 11 +++++++++++ 3 files changed, 33 insertions(+), 12 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json 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 +} -- cgit v1.2.3