Snap for 7266202 from 8bb9bc5bbbb41de0b1fb85314b48715c8f97e6a4 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: I503e2044c687b74a66aea7b8b0ddcf929eb5debf

1 files changed, 78 insertions, 4 deletions

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 @@ license {
 
 rust_library {
     name: "libring",
+    // has rustc warnings
     host_supported: true,
     crate_name: "ring",
     srcs: ["src/lib.rs"],
@@ -44,6 +46,7 @@ rust_library {
         "default",
         "dev_urandom_fallback",
         "once_cell",
+        "std",
     ],
     rustlibs: [
         "liblibc",
@@ -64,6 +67,7 @@ rust_library {
 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 @@ rust_defaults {
         "default",
         "dev_urandom_fallback",
         "once_cell",
+        "std",
     ],
     rustlibs: [
         "liblibc",
@@ -195,6 +200,9 @@ cc_library_static {
 rust_test_host {
     name: "ring_host_test_src_lib",
     defaults: ["ring_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -213,6 +221,7 @@ rust_defaults {
         "default",
         "dev_urandom_fallback",
         "once_cell",
+        "std",
     ],
     rustlibs: [
         "liblibc",
@@ -226,162 +235,227 @@ rust_defaults {
 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