diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-14 01:38:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 01:38:07 +0000 |
| commit | 933a44018e6a31ae0dcbf7d0b1efd906d5782dc5 (patch) | |
| tree | 921e9722f3ea482f886ff39241208a1b1a63e9d7 | |
| parent | a472ee8bd83f03a51b6f14d84841d2eb6de1755b (diff) | |
| parent | 15db1f730e116be406aef380eb3f0f4d833710c0 (diff) | |
| download | grpcio-compiler-933a44018e6a31ae0dcbf7d0b1efd906d5782dc5.tar.gz | |
Cleanup cargo2android configs and patches am: b954363880 am: 15db1f730e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-compiler/+/2751203
Change-Id: I0689ab35208f1c84f3cf82df3158d262978a002c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 36 |
2 files changed, 4 insertions, 38 deletions
diff --git a/cargo2android.json b/cargo2android.json index 595ea16..fe5cae7 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,6 +1,8 @@ { - "patch": "patches/Android.bp.patch", "dependencies": true, "run": true, - "tests": true + "tests": true, + "dep-suffixes": { + "protobuf": "_deprecated" + } } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index e0dbe5c..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ad56b17ba9a2ceb34a603a58899fe0469c46e2ed Mon Sep 17 00:00:00 2001 -From: Jeff Vander Stoep <jeffv@google.com> -Date: Wed, 22 Mar 2023 15:35:13 +0100 -Subject: [PATCH] Use version 2.x of the protobuf crate - -Test: TH -Bug: 270895633 -Change-Id: Ida6c42df913b57baadb0907f741627c3261a2f9c ---- - Android.bp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Android.bp b/Android.bp -index fb52b72..36ef473 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -47,7 +47,7 @@ rust_binary_host { - ], - rustlibs: [ - "libgrpcio_compiler", -- "libprotobuf", -+ "libprotobuf_deprecated", - ], - } - -@@ -64,6 +64,6 @@ rust_library_host { - "protobuf-codec", - ], - rustlibs: [ -- "libprotobuf", -+ "libprotobuf_deprecated", - ], - } --- -2.40.0.348.gf938b09366-goog - |