Fix license metadata in Android.bp in jni crate.HEADmastermain

Bug: 346390141
Test: CIs
Change-Id: I43a2cd5ba701bfa30c5dde7437120106dd5bf2ad

2 files changed, 16 insertions, 22 deletions

diff --git a/0.20.0/Android.bp b/0.20.0/Android.bp
index 29ed79a..c080821 100644
--- a/0.20.0/Android.bp
+++ b/0.20.0/Android.bp
@@ -1,3 +1,18 @@
+package {
+    default_applicable_licenses: ["external_rust_crates_jni_0_20_0_license"],
+}
+
+license {
+    name: "external_rust_crates_jni_0_20_0_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 rust_library {
     name: "libjni_legacy",
     host_supported: true,
diff --git a/Android.bp b/Android.bp
index 445994b..024e198 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,35 +7,14 @@ package {
     default_applicable_licenses: ["external_rust_crates_jni_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_jni_license",
     visibility: [":__subpackages__"],
     license_kinds: [
         "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-MIT",
     ],
     license_text: [
-        "LICENSE-APACHE",
-        "LICENSE-MIT",
+        "LICENSE",
     ],
 }