Merge 186a75da0cdf2b60f060903666da6aa103125c3c on remote branch
Change-Id: I4ce705227e5b0f7c1c04f675c777bd20e9e17afc
diff --git a/Android.bp b/Android.bp
index 1c91fdc..4aab8db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,41 @@
// This file is generated by cargo2android.py --run --device --tests --dependencies.
+package {
+ default_applicable_licenses: ["external_rust_crates_heck_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_heck_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
rust_defaults {
name: "heck_defaults",
crate_name: "heck",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 10744a3..60b40b7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,10 +2,6 @@
{
"presubmit": [
{
- "host": true,
- "name": "heck_host_test_src_lib"
- },
- {
"name": "heck_device_test_src_lib"
}
]