From 7e3dbd9f70dd52e0e82494ca3c510426d7a29772 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Sat, 23 Jan 2021 13:09:16 -0800
Subject: [PATCH] Add NAC, 0BSD, FSFAP, GFDL, and MS-RL

These appear frequently enough as unknowns in the large-scale-change to
automate detection. Detecting GFDL also enables excluding the embedded
references to CC-BY-SA that are otherwise false positives.

The "Not a contribution" findings have special treatment for the lsc.

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Change-Id: I7f83d8a5ca94eadfcc8144c2225ce01232994d47
---
 licenses/Android.bp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/licenses/Android.bp b/licenses/Android.bp
index 370375e3d..e87bdcf4c 100644
--- a/licenses/Android.bp
+++ b/licenses/Android.bp
@@ -25,6 +25,12 @@ license {
     license_text: ["LICENSE"],
 }
 
+license_kind {
+    name: "SPDX-license-identifier-0BSD",
+    conditions: ["unencumbered"],
+    url: "https://spdx.org/licenses/0BSD",
+}
+
 license_kind {
     name: "SPDX-license-identifier-AFL-1.1",
     conditions: ["by_exception_only"],
@@ -618,12 +624,23 @@ license_kind {
     url: "https://spdx.org/licenses/EUPL-1.0.html",
 }
 
+license_kind {
+    name: "SPDX-license-identifier-FSFAP",
+    conditions: ["notice"],
+    url: "https://spdx.org/licenses/FSFAP",
+}
+
 license_kind {
     name: "SPDX-license-identifier-FTL",
     conditions: ["notice"],
     url: "https://spdx.org/licenses/FTL.html",
 }
 
+license_kind {
+    name: "SPDX-license-identifier-GFDL",
+    conditions: ["by_exception_only"],
+}
+
 license_kind {
     name: "SPDX-license-identifier-GPL",
     conditions: ["restricted"],
@@ -937,6 +954,12 @@ license_kind {
     url: "https://spdx.org/licenses/MS-PL.html",
 }
 
+license_kind {
+    name: "SPDX-license-identifier-MS-RL",
+    conditions: ["by_exception_only"],
+    url: "https://spdx.org/licenses/MS-RL.html",
+}
+
 license_kind {
     name: "SPDX-license-identifier-NCSA",
     conditions: ["notice"],
@@ -1180,6 +1203,14 @@ license_kind {
     conditions: ["by_exception_only"],
 }
 
+license_kind {
+    name: "legacy_not_a_contribution",
+    conditions: [
+        "by_exception_only",
+        "not_allowed",
+    ],
+}
+
 license_kind {
     name: "legacy_not_allowed",
     conditions: [