diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2023-04-04 09:57:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-04 09:57:35 +0000 |
| commit | 7e35e0e1fd92550b32a4253008291ddcb19bf860 (patch) | |
| tree | 2ce832b3343f38c0e0e2cf946bd7fae274d4101b | |
| parent | 45fc577ba2dc010112396304a26b64a73dd0696f (diff) | |
| parent | a472ee8bd83f03a51b6f14d84841d2eb6de1755b (diff) | |
| download | grpcio-compiler-7e35e0e1fd92550b32a4253008291ddcb19bf860.tar.gz | |
Use version 2.x of the protobuf crate am: 6bdf5d4ca0 am: 3edc50751a am: 2a5353bb5e am: a472ee8bd8android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-compiler/+/2502376
Change-Id: Ibfc457d04b98ab369bc50a6e00f48e70bed75081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | cargo2android.json | 3 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 36 |
3 files changed, 44 insertions, 3 deletions
@@ -47,8 +47,10 @@ rust_binary_host { ], rustlibs: [ "libgrpcio_compiler", - "libprotobuf", + "libprotobuf_deprecated", ], + product_available: true, + vendor_available: true, } rust_library_host { @@ -64,6 +66,8 @@ rust_library_host { "protobuf-codec", ], rustlibs: [ - "libprotobuf", + "libprotobuf_deprecated", ], + product_available: true, + vendor_available: true, } diff --git a/cargo2android.json b/cargo2android.json index 9b0d064..595ea16 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,5 +1,6 @@ { + "patch": "patches/Android.bp.patch", "dependencies": true, "run": true, "tests": true -}
\ No newline at end of file +} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..e0dbe5c --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,36 @@ +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 + |