Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I455613d78eaf2304ae128de324ecb337aade1464
Change-Id: I723aff7dba17959d4dce5aa7eac40b845311fdac
diff --git a/Android.bp b/Android.bp
index 586bfb4..c39d946 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,42 @@
// This file is generated by cargo2android.py --run --dependencies --device --tests.
+package {
+ default_applicable_licenses: ["external_rust_crates_unicode-width_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-width_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_width",
// has rustc warnings
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b303d8f..e61165f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,17 +2,9 @@
{
"presubmit": [
{
- "host": true,
- "name": "unicode-width_host_test_src_lib"
- },
- {
"name": "unicode-width_device_test_src_lib"
},
{
- "host": true,
- "name": "libsqlite3-sys_host_test_src_lib"
- },
- {
"name": "libsqlite3-sys_device_test_src_lib"
}
]
