Merge "Add license_note and GPL 3.0" am: 886b9c47c2 am: 684f9c1f5d am: 21033ac00c am: 9b632a08d9

Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/2012221

Change-Id: I5aa52dd71bf0a69e543990bf9384ca96b4336cf7

2 files changed, 5 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 2466b88..4f9461f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,7 @@ license {
     name: "external_mtools_license",
     visibility: [":__subpackages__"],
     license_kinds: [
+        "SPDX-license-identifier-GPL-3.0",
         "legacy_by_exception_only", // by exception only
     ],
     license_text: [
diff --git a/METADATA b/METADATA
index e2fe90d..57cef2b 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,6 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
 name: "mtools"
 description:
     "Mtools is a collection of utilities to access MS-DOS disks from GNU and "
@@ -14,5 +17,6 @@ third_party {
   }
   version: "4.0.37"
   last_upgrade_date { year: 2022 month: 1 day: 9 }
+  license_note: "contains GFDL documentation"
   license_type: BY_EXCEPTION_ONLY
 }