diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-07-13 17:18:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-13 17:18:58 +0000 |
| commit | 17e46461587fca6408df330547780b60f0f15492 (patch) | |
| tree | d5d0afc468b30f6f28c0c8586a4cfe8947528cbe | |
| parent | 24b1b9f7b846a66532ad27ee946ff33d00d46148 (diff) | |
| parent | 8aee8a9e5c25f3e1a5ffe59c3d070a9b6347753a (diff) | |
| download | ring-17e46461587fca6408df330547780b60f0f15492.tar.gz | |
Remove patch. am: 8aee8a9e5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/1764586
Change-Id: I4d6ac8a771f0309438cb183c97e8fb940771cdfa
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | patches/whole_static_libs.patch | 11 |
3 files changed, 6 insertions, 14 deletions
@@ -87,7 +87,7 @@ rust_defaults { "libspin", "libuntrusted", ], - static_libs: [ + whole_static_libs: [ "libring-core", "libring-test", ], diff --git a/cargo2android.json b/cargo2android.json index 27fbf76..6b36a3c 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -11,5 +11,8 @@ "min-sdk-version": "29", "run": true, "tests": true, - "patch": "patches/whole_static_libs.patch" -} + "whole-static-libs": [ + "ring-core", + "ring-test" + ] +}
\ No newline at end of file diff --git a/patches/whole_static_libs.patch b/patches/whole_static_libs.patch deleted file mode 100644 index cdc7da8..0000000 --- a/patches/whole_static_libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Android.bp.orig 2021-07-13 05:18:27.737087081 +0900 -+++ Android.bp 2021-07-13 05:19:16.036656691 +0900 -@@ -54,7 +54,7 @@ rust_library { - "libspin", - "libuntrusted", - ], -- static_libs: [ -+ whole_static_libs: [ - "libring-core", - "libring-test", - ], |