diff options
| author | Jakob Vukalović <jakobvukalovic@google.com> | 2023-05-19 13:11:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-19 13:11:52 +0000 |
| commit | cb3d09cffc4d4515c504af5d4afe55d25eddf0bb (patch) | |
| tree | 64ee364a854ab78e69c38003462e3a73610f9175 | |
| parent | b26f7f99bb356b05ea19b636bdc41bf9e5c43fbf (diff) | |
| parent | 4ee9da9c77d1ac611d597fa754d64d519dcb3d5e (diff) | |
| download | openssl-cb3d09cffc4d4515c504af5d4afe55d25eddf0bb.tar.gz | |
Merge "Use libbitflags-1.3.2" am: fbe1166c69 am: b5c1e9793a am: 3f0fa61591 am: 4ee9da9c77
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2564838
Change-Id: I0ebdb610eac460bc3e305390138dbb168421d46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -56,7 +56,7 @@ rust_library { features: ["unstable_boringssl"], cfgs: ["boringssl", "soong"], rustlibs: [ - "libbitflags", + "libbitflags-1.3.2", "libcfg_if", "libbssl_ffi", "libforeign_types", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index 9f7b012..ef0ab4f 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -1,5 +1,5 @@ diff --git a/Android.bp b/Android.bp -index 2282c66..4e9011c 100644 +index 6628b2a..0ece701 100644 --- a/Android.bp +++ b/Android.bp @@ -54,11 +54,11 @@ rust_library { @@ -9,7 +9,8 @@ index 2282c66..4e9011c 100644 - cfgs: ["boringssl"], + cfgs: ["boringssl", "soong"], rustlibs: [ - "libbitflags", +- "libbitflags", ++ "libbitflags-1.3.2", "libcfg_if", - "libopenssl_sys", + "libbssl_ffi", |