update master-with-bazel from master branch
diff --git a/src/rust/bssl-sys/src/lib.rs b/src/rust/bssl-sys/src/lib.rs
index fa52ec7..e7f5fc4 100644
--- a/src/rust/bssl-sys/src/lib.rs
+++ b/src/rust/bssl-sys/src/lib.rs
@@ -7,7 +7,13 @@
// Wrap the bindgen output in a module and re-export it, so we can override it
// as needed.
mod bindgen {
+ #[cfg(not(soong))]
include!(env!("BINDGEN_RS_FILE"));
+ // Soong, Android's build tool, does not support configuring environment
+ // variables like other Rust build systems too. However, it does support
+ // some hardcoded behavior with the OUT_DIR variable.
+ #[cfg(soong)]
+ include!(concat!(env!("OUT_DIR"), "/bssl_sys_bindings.rs"));
}
pub use bindgen::*;
