Re-run new version of cargo_embargo to fix license module.
Test: Compared Android.bp
Change-Id: Icf290adddfae8900a38dc86a70c7c1f4ffe425c9
diff --git a/Android.bp b/Android.bp
index 6fce56e..db72040 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,42 +1,20 @@
// This file is generated by cargo_embargo.
-// Do not modify this file after the first "rust_*" or "genrule" module
-// because the changes will be overridden on upgrade.
-// Content before the first "rust_*" or "genrule" module is preserved.
+// Do not modify this file because the changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_unicode-ident_license"],
+ default_team: "trendy_team_android_rust",
}
-// 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-ident_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
+ "SPDX-license-identifier-Unicode-DFS-2016",
],
license_text: [
"LICENSE-APACHE",
- "LICENSE-MIT",
"LICENSE-UNICODE",
],
}
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 253d830..5f964c5 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -2,7 +2,8 @@
"package": {
"unicode-ident": {
"device_supported": false,
- "host_first_multilib": true
+ "host_first_multilib": true,
+ "license_text": ["LICENSE-APACHE", "LICENSE-UNICODE"]
}
},
"run_cargo": false
