From 83a0b8f48036aa32563e83011ae63dea98cf0dac Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 28 Oct 2022 12:07:20 -0700 Subject: [PATCH] Move restricted_allows_dynamic_linking into LGPL Putting the specific condition into the license_kind simplifies the logic and prepares for a future where licenseclassifier provides conditions without license_kinds Bug: 245562496 Test: m droid Change-Id: I42c26fb3096b40767a68474ed712dbe55ed3f035 --- licenses/Android.bp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/licenses/Android.bp b/licenses/Android.bp index 61b17bf47..2e5c361ed 100644 --- a/licenses/Android.bp +++ b/licenses/Android.bp @@ -839,84 +839,84 @@ license_kind { license_kind { name: "SPDX-license-identifier-LGPL", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], } license_kind { name: "SPDX-license-identifier-LGPL-2.0", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.0.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.0+", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.0+.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.0-only", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.0-only.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.0-or-later", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.0-or-later.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.1", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.1.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.1+", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.1+.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.1-only", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.1-only.html", } license_kind { name: "SPDX-license-identifier-LGPL-2.1-or-later", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-2.1-or-later.html", } license_kind { name: "SPDX-license-identifier-LGPL-3.0", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-3.0.html", } license_kind { name: "SPDX-license-identifier-LGPL-3.0+", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-3.0+.html", } license_kind { name: "SPDX-license-identifier-LGPL-3.0-only", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-3.0-only.html", } license_kind { name: "SPDX-license-identifier-LGPL-3.0-or-later", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPL-3.0-or-later.html", } license_kind { name: "SPDX-license-identifier-LGPLLR", - conditions: ["restricted"], + conditions: ["restricted_allows_dynamic_linking"], url: "https://spdx.org/licenses/LGPLLR.html", }