Snap for 7149879 from 985c813f8f642419249c0a5b1f6a40b12c5e1074 to sc-v2-release
Change-Id: I2bc6cb23443b9fbc11a5d49312e52f62467b9b23
diff --git a/Android.bp b/Android.bp
index 4515e22..0354de3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,42 @@
// This file is generated by cargo2android.py --run --device --tests --dependencies.
+package {
+ default_applicable_licenses: ["external_rust_crates_unicode-xid_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.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_crates_unicode-xid_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "COPYRIGHT",
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
rust_library {
name: "libunicode_xid",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ac3aae3..8965b1e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,56 +2,16 @@
{
"presubmit": [
{
- "host": true,
- "name": "unicode-xid_host_test_src_lib"
- },
- {
"name": "unicode-xid_device_test_src_lib"
},
{
- "host": true,
- "name": "unicode-xid_host_test_tests_exhaustive_tests"
- },
- {
"name": "unicode-xid_device_test_tests_exhaustive_tests"
},
{
- "host": true,
- "name": "pin-project-internal_host_test_src_lib"
- },
- {
- "host": true,
- "name": "futures-util_host_test_src_lib"
- },
- {
"name": "futures-util_device_test_src_lib"
},
{
- "host": true,
- "name": "proc-macro2_host_test_src_lib"
- },
- {
- "host": true,
- "name": "structopt-derive_host_test_src_lib"
- },
- {
- "host": true,
- "name": "tokio-macros_host_test_src_lib"
- },
- {
- "host": true,
- "name": "proc-macro-error-attr_host_test_src_lib"
- },
- {
- "host": true,
- "name": "libsqlite3-sys_host_test_src_lib"
- },
- {
"name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "host": true,
- "name": "syn-mid_host_test_src_lib"
}
]
}
