diff options
author | Maurice Lam <yukl@google.com> | 2023-12-21 22:47:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-21 22:47:55 +0000 |
commit | cd84efd888a947be39e5998b01dd743807c3e3d1 (patch) | |
tree | 7c5a434ee42bb3e7d53336973fe5530595627bff | |
parent | 88db7f6ce150beaa1da22e37babb5d9c1f7c4d0e (diff) | |
parent | 4f1b0842e9aea467d3853d30ff19f99d32b54a70 (diff) | |
download | openssl-cd84efd888a947be39e5998b01dd743807c3e3d1.tar.gz |
Rename bssl-ffi to bssl-sys am: c42d58dcc7 am: 4f1b0842e9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2880479
Change-Id: I63ec40794009807083abd826836075388c2c23f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo/config.toml | 2 | ||||
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | Cargo.lock | 2 | ||||
-rw-r--r-- | cargo_embargo.json | 2 | ||||
-rw-r--r-- | patches/0001-cfgs.diff | 4 | ||||
-rw-r--r-- | patches/Android.bp.diff | 2 | ||||
-rw-r--r-- | src/lib.rs | 2 |
7 files changed, 9 insertions, 11 deletions
diff --git a/.cargo/config.toml b/.cargo/config.toml index 278afcd..77327b7 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [patch.crates-io] -bssl-ffi = { package = "bssl-sys", version = "0.1.0", path = "../../../boringssl/src/rust/bssl-sys", optional=true } +bssl-sys = { version = "0.1.0", path = "../../../boringssl/src/rust/bssl-sys", optional=true } @@ -10,7 +10,7 @@ // // Even if upstreamed, cargo2android.py will likely never run correctly on // this package without modification because boringssl does not intend to -// publish "bssl-ffi" on crates.io, since it needs to match the exact local +// publish "bssl-sys" on crates.io, since it needs to match the exact local // version of boringssl. package { @@ -60,7 +60,7 @@ rust_library { ], rustlibs: [ "libbitflags-1.3.2", - "libbssl_ffi", + "libbssl_sys", "libcfg_if", "libforeign_types", "liblibc", @@ -95,7 +95,7 @@ rust_library_host_rlib { "libonce_cell", ], rlibs: [ - "libbssl_ffi_static", + "libbssl_sys_static", ], proc_macros: ["libopenssl_macros"], } @@ -60,8 +60,6 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bssl-sys" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312d12393c060384f2e6ed14c7b4be37b3dd90249857485613c1a91b9a1abb5c" [[package]] name = "cc" diff --git a/cargo_embargo.json b/cargo_embargo.json index 16df1d0..d09e89f 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -17,7 +17,7 @@ { "module_name_overrides": { "libbitflags": "libbitflags-1.3.2", - "libopenssl_sys": "libbssl_ffi" + "libopenssl_sys": "libbssl_sys" } }, { diff --git a/patches/0001-cfgs.diff b/patches/0001-cfgs.diff index ae6ba11..6cc5f29 100644 --- a/patches/0001-cfgs.diff +++ b/patches/0001-cfgs.diff @@ -5,7 +5,7 @@ index 0000000..e2b197d +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[patch.crates-io] -+bssl-ffi = { package = "bssl-sys", version = "0.1.0", path = "../../../boringssl/src/rust/bssl-sys", optional=true } ++bssl-sys = { version = "0.1.0", path = "../../../boringssl/src/rust/bssl-sys", optional=true } diff --git a/src/cipher.rs b/src/cipher.rs index ab5f49d..84a8265 100644 --- a/src/cipher.rs @@ -71,7 +71,7 @@ index 891651e..f149bfd 100644 #![warn(rust_2018_idioms)] +#[cfg(all(soong, boringssl))] -+extern crate bssl_ffi as ffi; ++extern crate bssl_sys as ffi; + #[doc(inline)] pub use ffi::init; diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index b9f0654..808329d 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -9,7 +9,7 @@ index 1e027e2..c650f2e 100644 - "libopenssl_sys", + ], + rlibs: [ -+ "libbssl_ffi_static", ++ "libbssl_sys_static", ], proc_macros: ["libopenssl_macros"], } @@ -121,7 +121,7 @@ #![warn(rust_2018_idioms)] #[cfg(all(soong, boringssl))] -extern crate bssl_ffi as ffi; +extern crate bssl_sys as ffi; #[doc(inline)] pub use ffi::init; |