diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-04 03:01:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-04 03:01:00 +0000 |
| commit | 312c5f99a432a1f0890efc748a7c2040fa947a95 (patch) | |
| tree | 6723d8ff6db4d08a343e031fac036ca62764dd38 | |
| parent | e6f39bcc7b8bdf10d2e5c90cf72ed3a2eeba0f82 (diff) | |
| parent | 3fe1a4a95ba652c8879a72f2ffa54fe57a15887d (diff) | |
| download | beto-rust-312c5f99a432a1f0890efc748a7c2040fa947a95.tar.gz | |
Snap for 9875146 from 3fe1a4a95ba652c8879a72f2ffa54fe57a15887d to udc-release
Change-Id: I967c95146ed936f63b6d95bb432bd6381fa8e08a
| -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 89bf331..4183862 100644 --- a/nearby/Android.bp +++ b/nearby/Android.bp @@ -145,7 +145,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", |