StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CC-BY-ND licenses" am: 2b244217a2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893223

Change-Id: I47fb9a1e3b0c0e8ef32b41107d572ac7f389a99b
This commit is contained in:
Treehugger Robot
2021-11-16 06:36:39 +00:00
committed by Automerger Merge Worker
parent 7f98f45ff8 2b244217a2
commit 444727a285
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
licenses/Android.bp
View File

@@ -492,36 +492,36 @@ license_kind {
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND", name: "SPDX-license-identifier-CC-BY-ND",
conditions: ["restricted"], conditions: ["by_exception_only"],
} }
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND-1.0", name: "SPDX-license-identifier-CC-BY-ND-1.0",
conditions: ["restricted"], conditions: ["by_exception_only"],
url: "https://spdx.org/licenses/CC-BY-ND-1.0.html", url: "https://spdx.org/licenses/CC-BY-ND-1.0.html",
} }
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND-2.0", name: "SPDX-license-identifier-CC-BY-ND-2.0",
conditions: ["restricted"], conditions: ["by_exception_only"],
url: "https://spdx.org/licenses/CC-BY-ND-2.0.html", url: "https://spdx.org/licenses/CC-BY-ND-2.0.html",
} }
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND-2.5", name: "SPDX-license-identifier-CC-BY-ND-2.5",
conditions: ["restricted"], conditions: ["by_exception_only"],
url: "https://spdx.org/licenses/CC-BY-ND-2.5.html", url: "https://spdx.org/licenses/CC-BY-ND-2.5.html",
} }
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND-3.0", name: "SPDX-license-identifier-CC-BY-ND-3.0",
conditions: ["restricted"], conditions: ["by_exception_only"],
url: "https://spdx.org/licenses/CC-BY-ND-3.0.html", url: "https://spdx.org/licenses/CC-BY-ND-3.0.html",
} }
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-ND-4.0", name: "SPDX-license-identifier-CC-BY-ND-4.0",
conditions: ["restricted"], conditions: ["by_exception_only"],
url: "https://spdx.org/licenses/CC-BY-ND-4.0.html", url: "https://spdx.org/licenses/CC-BY-ND-4.0.html",
} }
@@ -562,7 +562,10 @@ license_kind {
license_kind { license_kind {
name: "SPDX-license-identifier-CC-BY-SA-ND", name: "SPDX-license-identifier-CC-BY-SA-ND",
conditions: ["restricted"], conditions: [
"restricted",
"by_exception_only",
],
} }
license_kind { license_kind {