diff options
| -rw-r--r-- | Android.bp | 80 | ||||
| -rw-r--r-- | cargo_embargo.json | 2 |
2 files changed, 34 insertions, 48 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. package { default_applicable_licenses: ["external_rust_crates_ring_license"], @@ -40,7 +42,7 @@ rust_library { crate_name: "ring", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["src/lib.rs"], + crate_root: "src/lib.rs", edition: "2018", features: [ "alloc", @@ -49,7 +51,6 @@ rust_library { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -75,11 +76,11 @@ rust_test { crate_name: "ring", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["src/lib.rs"], + crate_root: "src/lib.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -89,7 +90,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -108,11 +108,11 @@ rust_test { crate_name: "aead_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/aead_tests.rs"], + crate_root: "tests/aead_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -122,7 +122,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -138,11 +137,11 @@ rust_test { crate_name: "agreement_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/agreement_tests.rs"], + crate_root: "tests/agreement_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -152,7 +151,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -168,11 +166,11 @@ rust_test { crate_name: "constant_time_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/constant_time_tests.rs"], + crate_root: "tests/constant_time_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -182,7 +180,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -198,11 +195,11 @@ rust_test { crate_name: "digest_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/digest_tests.rs"], + crate_root: "tests/digest_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -212,7 +209,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -228,11 +224,11 @@ rust_test { crate_name: "ecdsa_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/ecdsa_tests.rs"], + crate_root: "tests/ecdsa_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -242,7 +238,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -258,11 +253,11 @@ rust_test { crate_name: "ed25519_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/ed25519_tests.rs"], + crate_root: "tests/ed25519_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -272,7 +267,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -288,11 +282,11 @@ rust_test { crate_name: "hkdf_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/hkdf_tests.rs"], + crate_root: "tests/hkdf_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -302,7 +296,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -318,11 +311,11 @@ rust_test { crate_name: "hmac_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/hmac_tests.rs"], + crate_root: "tests/hmac_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -332,7 +325,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -348,11 +340,11 @@ rust_test { crate_name: "pbkdf2_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/pbkdf2_tests.rs"], + crate_root: "tests/pbkdf2_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -362,7 +354,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -378,11 +369,11 @@ rust_test { crate_name: "quic_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/quic_tests.rs"], + crate_root: "tests/quic_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -392,7 +383,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -408,11 +398,11 @@ rust_test { crate_name: "rand_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/rand_tests.rs"], + crate_root: "tests/rand_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -422,7 +412,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -438,11 +427,11 @@ rust_test { crate_name: "rsa_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/rsa_tests.rs"], + crate_root: "tests/rsa_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -452,7 +441,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -468,11 +456,11 @@ rust_test { crate_name: "signature_tests", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["tests/signature_tests.rs"], + crate_root: "tests/signature_tests.rs", test_suites: ["general-tests"], auto_gen_config: true, test_options: { - unit_test: true, + unit_test: false, }, edition: "2018", features: [ @@ -482,7 +470,6 @@ rust_test { "once_cell", "std", ], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", @@ -497,10 +484,9 @@ rust_library_rlib { crate_name: "ring", cargo_env_compat: true, cargo_pkg_version: "0.17.0-alpha.11", - srcs: ["src/lib.rs"], + crate_root: "src/lib.rs", edition: "2018", features: ["once_cell"], - cfgs: ["soong"], rustlibs: [ "liblibc", "libonce_cell", diff --git a/cargo_embargo.json b/cargo_embargo.json index bc68e9c..5780b53 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -3,11 +3,11 @@ "//apex_available:platform", "com.android.resolv" ], - "extra_cfg": ["soong"], "min_sdk_version": "29", "package": { "ring": { "add_toplevel_block": "cargo2android_cc.bp", + "no_presubmit": true, "whole_static_libs": [ "libring-core", "libring-test" |