Merge SP1A.210222.001
Change-Id: If2de47686663178ba498647eab66cb095526f4eb
diff --git a/Android.bp b/Android.bp
index c2a35e2..974e876 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,43 @@
// This file is generated by cargo2android.py --run --dependencies --host-first-multilib --tests.
+package {
+ default_applicable_licenses: [
+ "external_rust_crates_proc-macro-error-attr_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_proc-macro-error-attr_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
rust_proc_macro {
name: "libproc_macro_error_attr",
crate_name: "proc_macro_error_attr",
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index f890bf7..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by cargo2android.py for tests in Android.bp
-{
- "presubmit": [
- {
- "host": true,
- "name": "proc-macro-error-attr_host_test_src_lib"
- },
- {
- "host": true,
- "name": "structopt-derive_host_test_src_lib"
- }
- ]
-}