diff options
| author | Jakob Vukalovic <jakobvukalovic@google.com> | 2023-04-26 15:40:33 +0100 |
|---|---|---|
| committer | Jakob Vukalović <jakobvukalovic@google.com> | 2023-05-18 17:42:38 +0000 |
| commit | 65eb8b2ee604471dc4712908ce93969e88c1cfad (patch) | |
| tree | 7badcaeed26ba87fd1dcd7bb51792a7b4d9f07c7 | |
| parent | 787faf931078d864b3cdfff03bfc3147db800f99 (diff) | |
| download | openssl-65eb8b2ee604471dc4712908ce93969e88c1cfad.tar.gz | |
Use libbitflags-1.3.2
This updates Android.bp to still use the old version of libbitflags instead
of the most recent version. Also update the patch file for Android.bp which
ensures version 1.3.2 is still used after an update.
Test: Build
Change-Id: I30d16b6217c56d3e7572f06625462b974b6fee43
Merged-In: I55abd9f93ddf0fb01847b57183eae6b31945dbce
| -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", |