Snap for 7269134 from 8bb9bc5bbbb41de0b1fb85314b48715c8f97e6a4 to sc-mainline-release
Change-Id: I3c7e7732670c3559e429a90b8a03f828082d65a0
diff --git a/Android.bp b/Android.bp
index 4399d5f..49e26d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff.
+// This file is generated by cargo2android.py --run --device --dependencies --features alloc,default,dev_urandom_fallback,once_cell,std --tests --patch=patches/Android.bp.diff.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_ring_license"],
@@ -35,6 +36,7 @@
rust_library {
name: "libring",
+ // has rustc warnings
host_supported: true,
crate_name: "ring",
srcs: ["src/lib.rs"],
@@ -44,6 +46,7 @@
"default",
"dev_urandom_fallback",
"once_cell",
+ "std",
],
rustlibs: [
"liblibc",
@@ -64,6 +67,7 @@
rust_defaults {
name: "ring_defaults",
crate_name: "ring",
+ // has rustc warnings
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -73,6 +77,7 @@
"default",
"dev_urandom_fallback",
"once_cell",
+ "std",
],
rustlibs: [
"liblibc",
@@ -195,6 +200,9 @@
rust_test_host {
name: "ring_host_test_src_lib",
defaults: ["ring_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
@@ -213,6 +221,7 @@
"default",
"dev_urandom_fallback",
"once_cell",
+ "std",
],
rustlibs: [
"liblibc",
@@ -226,162 +235,227 @@
rust_test_host {
name: "ring_host_test_tests_aead_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/aead_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_aead_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/aead_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_agreement_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/agreement_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_agreement_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/agreement_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_constant_time_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/constant_time_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_constant_time_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/constant_time_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_digest_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/digest_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_digest_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/digest_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_ecdsa_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/ecdsa_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_ecdsa_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/ecdsa_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_ed25519_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/ed25519_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_ed25519_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/ed25519_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_hkdf_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/hkdf_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_hkdf_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/hkdf_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_hmac_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/hmac_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_hmac_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/hmac_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_pbkdf2_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/pbkdf2_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_pbkdf2_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/pbkdf2_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_quic_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/quic_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_quic_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/quic_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_rand_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/rand_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_rand_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/rand_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_rsa_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/rsa_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_rsa_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/rsa_tests.rs"],
}
rust_test_host {
name: "ring_host_test_tests_signature_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/signature_tests.rs"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
name: "ring_device_test_tests_signature_tests",
defaults: ["ring_defaults_ring"],
+ // has rustc warnings
srcs: ["tests/signature_tests.rs"],
}
// dependent_library ["feature_list"]
-// cc-1.0.66
-// libc-0.2.81
-// once_cell-1.5.2 "alloc,std"
+// cc-1.0.67
+// libc-0.2.93
+// once_cell-1.7.2 "alloc,race,std"
// spin-0.5.2
// untrusted-0.7.1
