diff options
author | Luke Huang <huangluke@google.com> | 2021-04-07 12:06:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-07 12:06:51 +0000 |
commit | 8bb9bc5bbbb41de0b1fb85314b48715c8f97e6a4 (patch) | |
tree | ef6ac5e5e83f9eac484be47c563bd951d48608a9 | |
parent | e8abc4f1f693a304ceb7478b196fc7558ce7dd55 (diff) | |
parent | 671c37d07522cf82f9a7e7599a3e1f644c3b3064 (diff) | |
download | ring-android12L-d2-s2-release.tar.gz |
Enable feature std for ring am: 0d2595cd2a am: 67aa9d1409 am: 671c37d075android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/1657099
Change-Id: I5b1ba8189425aab90e23d6e51eb12dd062722752
-rw-r--r-- | Android.bp | 82 |
1 files changed, 78 insertions, 4 deletions
@@ -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 |