Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: Iac9d763db22e43a56fd1ccf6c288b3ad380c9d42
Change-Id: I7685667bd5c02f53f5821db757d2eeba03def79d
diff --git a/Android.bp b/Android.bp
index d3e4d5a..4399d5f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,38 @@
// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff.
+package {
+ default_applicable_licenses: ["external_rust_crates_ring_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_crates_ring_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-ISC",
+ "SPDX-license-identifier-MIT",
+ "SPDX-license-identifier-OpenSSL",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
rust_library {
name: "libring",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index a151304..68408ce 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,38 +2,18 @@
{
"presubmit": [
{
- "host": true,
- "name": "ring_host_test_src_lib"
- },
- {
"name": "ring_device_test_src_lib"
},
{
- "host": true,
- "name": "ring_host_test_tests_aead_tests"
- },
- {
"name": "ring_device_test_tests_aead_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_agreement_tests"
- },
- {
"name": "ring_device_test_tests_agreement_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_constant_time_tests"
- },
- {
"name": "ring_device_test_tests_constant_time_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_digest_tests"
- },
- {
"name": "ring_device_test_tests_digest_tests",
"options": [
{
@@ -42,66 +22,30 @@
]
},
{
- "host": true,
- "name": "ring_host_test_tests_ecdsa_tests"
- },
- {
"name": "ring_device_test_tests_ecdsa_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_ed25519_tests"
- },
- {
"name": "ring_device_test_tests_ed25519_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_hkdf_tests"
- },
- {
"name": "ring_device_test_tests_hkdf_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_hmac_tests"
- },
- {
"name": "ring_device_test_tests_hmac_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_pbkdf2_tests"
- },
- {
"name": "ring_device_test_tests_pbkdf2_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_quic_tests"
- },
- {
"name": "ring_device_test_tests_quic_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_rand_tests"
- },
- {
"name": "ring_device_test_tests_rand_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_rsa_tests"
- },
- {
"name": "ring_device_test_tests_rsa_tests"
},
{
- "host": true,
- "name": "ring_host_test_tests_signature_tests"
- },
- {
"name": "ring_device_test_tests_signature_tests"
}
]
