diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2023-04-03 21:08:19 +0200 |
|---|---|---|
| committer | Jeff Vander Stoep <jeffv@google.com> | 2023-04-03 21:08:19 +0200 |
| commit | 69c8afbb3bb095f06a3ed72b5c70d73339dccf50 (patch) | |
| tree | 22c91ea56120f420c32762d6fb62a3d275d8cf92 | |
| parent | 1947abed99424e853b18a53741b739b1b0b1197c (diff) | |
| download | beto-rust-69c8afbb3bb095f06a3ed72b5c70d73339dccf50.tar.gz | |
Use protobuf v2.x
This is functionally a no-op. The rest of the system is migrating
to v3.x of protobuf. Have existing users of protobuf continue to
use 2.x until they can be upgraded.
Bug: 270895633
Test: TreeHugger
Change-Id: Ie2d9df2b770ce371b90c64d5dc00fd1affa26b61
| -rw-r--r-- | nearby/Android.bp | 2 | ||||
| -rw-r--r-- | nearby/cargo2android.json | 1 | ||||
| -rw-r--r-- | nearby/patches/Android.bp.patch | 13 |
3 files changed, 15 insertions, 1 deletions
diff --git a/nearby/Android.bp b/nearby/Android.bp index 844b516..f4bb9e5 100644 --- a/nearby/Android.bp +++ b/nearby/Android.bp @@ -140,7 +140,7 @@ rust_library { "default", ], rustlibs: [ - "libprotobuf", + "libprotobuf_deprecated", ], apex_available: [ "//apex_available:platform", diff --git a/nearby/cargo2android.json b/nearby/cargo2android.json index 8072e3f..84e42b8 100644 --- a/nearby/cargo2android.json +++ b/nearby/cargo2android.json @@ -1,4 +1,5 @@ { + "patch": "patches/Android.bp.patch", "device": true, "run": true, "features": "openssl,boringssl", diff --git a/nearby/patches/Android.bp.patch b/nearby/patches/Android.bp.patch new file mode 100644 index 0000000..753af2c --- /dev/null +++ b/nearby/patches/Android.bp.patch @@ -0,0 +1,13 @@ +diff --git a/nearby/Android.bp b/nearby/Android.bp +index 844b516..f4bb9e5 100644 +--- a/nearby/Android.bp ++++ b/nearby/Android.bp +@@ -140,7 +140,7 @@ rust_library { + "default", + ], + rustlibs: [ +- "libprotobuf", ++ "libprotobuf_deprecated", + ], + apex_available: [ + "//apex_available:platform", |