Merge "When wal flag not enabled set db back to default" into main
diff --git a/fsverity/Android.bp b/fsverity/Android.bp
index 93b4d93..ce3b499 100644
--- a/fsverity/Android.bp
+++ b/fsverity/Android.bp
@@ -44,7 +44,6 @@
name: "libfsverity_digests_proto_rust",
crate_name: "fsverity_digests_proto",
source_stem: "fsverity_digests_proto",
- use_protobuf3: true,
protos: [
"fsverity_digests.proto",
],
diff --git a/ondevice-signing/proto/Android.bp b/ondevice-signing/proto/Android.bp
index 6b1e35f..356e661 100644
--- a/ondevice-signing/proto/Android.bp
+++ b/ondevice-signing/proto/Android.bp
@@ -37,7 +37,6 @@
crate_name: "odsign_proto",
protos: ["odsign_info.proto"],
source_stem: "odsign_proto",
- use_protobuf3: true,
host_supported: true,
apex_available: [
"com.android.compos",
diff --git a/prng_seeder/Android.bp b/prng_seeder/Android.bp
index 763aaa0..3c8179f 100644
--- a/prng_seeder/Android.bp
+++ b/prng_seeder/Android.bp
@@ -36,7 +36,7 @@
edition: "2021",
rustlibs: [
"libanyhow",
- "libbssl_ffi",
+ "libbssl_sys",
"libclap",
"libcutils_socket_bindgen",
"liblogger",
@@ -70,7 +70,7 @@
srcs: ["src/main.rs"],
rustlibs: [
"libanyhow",
- "libbssl_ffi",
+ "libbssl_sys",
"libclap",
"libcutils_socket_bindgen",
"liblogger",
diff --git a/prng_seeder/src/drbg.rs b/prng_seeder/src/drbg.rs
index 808ea18..7190353 100644
--- a/prng_seeder/src/drbg.rs
+++ b/prng_seeder/src/drbg.rs
@@ -13,7 +13,6 @@
// limitations under the License.
use anyhow::{ensure, Result};
-use bssl_ffi as bssl_sys;
pub const ENTROPY_LEN: usize = bssl_sys::CTR_DRBG_ENTROPY_LEN as usize;