diff options
| author | David Drysdale <drysdale@google.com> | 2023-09-18 14:27:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-18 14:27:24 +0000 |
| commit | ff42d89e223aa19a26fbf83fe6d001963e68c45e (patch) | |
| tree | c2797e7c2ef45e45fa337b28436c1ff64d2fb122 | |
| parent | d402fea34ae3289969b86e87f6f6dba97a0ba465 (diff) | |
| parent | 266edc92ac453c9020aa7bc345393dca4f1059d4 (diff) | |
| download | boringssl-ff42d89e223aa19a26fbf83fe6d001963e68c45e.tar.gz | |
Update genrule to avoid patch on update am: 6d951996a8 am: f1947c3274 am: 266edc92ac
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2753686
Change-Id: If9d44d6ade441b94afcc8840bc82ce3b3a404069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | UPDATING | 5 | ||||
| -rw-r--r-- | src/rust/bssl-sys/src/lib.rs | 2 |
3 files changed, 2 insertions, 7 deletions
@@ -796,7 +796,7 @@ cc_library_host_static { gensrcs { name: "libbssl_sys_src", srcs: ["src/rust/bssl-sys/src/lib.rs"], - cmd: "sed 's@^.{INCLUDES}@pub use bssl_sys_raw::*;@' $(in) > $(out)", + cmd: "sed 's@^include!(env!(\"BINDGEN_RS_FILE\"));@pub use bssl_sys_raw::*;@' $(in) > $(out)", } rust_defaults { @@ -52,11 +52,6 @@ rm -Rf apple-aarch64 apple-arm apple-x86 apple-x86_64 ios-aarch64 ios-arm \ python3 src/util/generate_build_files.py android android-cmake bazel cmake eureka cp src/LICENSE NOTICE -# TODO(b/291253039): As a workaround for problems with the Android Rust build, -# we currently need to revert a change in bssl-sys. -sed -i -e 's/^include.*BINDGEN_RS_FILE.*$/${INCLUDES}/' src/rust/bssl-sys/src/lib.rs - git add . git commit --no-verify -F $msgfile rm -f $msgfile - diff --git a/src/rust/bssl-sys/src/lib.rs b/src/rust/bssl-sys/src/lib.rs index 997f9d79..06b907cf 100644 --- a/src/rust/bssl-sys/src/lib.rs +++ b/src/rust/bssl-sys/src/lib.rs @@ -3,7 +3,7 @@ #![allow(non_snake_case)] // Set in build.rs -${INCLUDES} +include!(env!("BINDGEN_RS_FILE")); // TODO(crbug.com/boringssl/596): Remove these wrappers. pub fn ERR_GET_LIB(packed_error: u32) -> i32 { |