diff options
| author | Andrew Walbran <qwandor@google.com> | 2024-05-03 16:15:05 +0100 |
|---|---|---|
| committer | Andrew Walbran <qwandor@google.com> | 2024-05-03 16:15:05 +0100 |
| commit | 5794b195e3aef845564c963a14966b5c7f5af5b9 (patch) | |
| tree | 29bac5cef9de86b7e8893cf9f0b4b10c13f012a1 | |
| parent | 3fae50980c68802bc27d6a6fef8a464914713651 (diff) | |
| download | openssl-master.tar.gz | |
Since https://r.android.com/3066423 Soong sets it automatically.
Test: m libopenssl_static libopenssl
Change-Id: Id40afc2fee655880c73503a5b4b7ef67c657c279
| -rw-r--r-- | Android.bp | 16 | ||||
| -rw-r--r-- | cargo_embargo.json | 2 |
2 files changed, 8 insertions, 10 deletions
@@ -1,5 +1,7 @@ // This file is generated by cargo_embargo. -// Do not modify this file as changes will be overridden on upgrade. +// Do not modify this file after the first "rust_*" or "genrule" module +// because the changes will be overridden on upgrade. +// Content before the first "rust_*" or "genrule" module is preserved. // WARNING! This crate has a change in dependency structure that is not yet // reflected on crates.io. This means that the automated update tool will @@ -54,10 +56,7 @@ rust_library { srcs: ["src/lib.rs"], edition: "2018", features: ["unstable_boringssl"], - cfgs: [ - "boringssl", - "soong", - ], + cfgs: ["boringssl"], rustlibs: [ "libbitflags", "libbssl_sys", @@ -67,6 +66,7 @@ rust_library { "libonce_cell", ], proc_macros: ["libopenssl_macros"], + aliases: ["openssl_sys:ffi"], apex_available: [ "//apex_available:platform", "com.android.virt", @@ -83,10 +83,7 @@ rust_library_host_rlib { srcs: ["src/lib.rs"], edition: "2018", features: ["unstable_boringssl"], - cfgs: [ - "boringssl", - "soong", - ], + cfgs: ["boringssl"], rustlibs: [ "libbitflags", "libcfg_if", @@ -98,4 +95,5 @@ rust_library_host_rlib { "libbssl_sys_static", ], proc_macros: ["libopenssl_macros"], + aliases: ["openssl_sys:ffi"], } diff --git a/cargo_embargo.json b/cargo_embargo.json index c483eb6..c2f3caa 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -3,7 +3,7 @@ "//apex_available:platform", "com.android.virt" ], - "extra_cfg": ["boringssl", "soong"], + "extra_cfg": ["boringssl"], "features": [ "unstable_boringssl" ], |