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 am: 444727a285 am: e04b66de96

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

Change-Id: I5b6a5109058b4c81c9fe91a10db0290730967c1c
This commit is contained in:
Treehugger Robot
2021-11-16 07:13:17 +00:00
committed by Automerger Merge Worker
parent 501f02c3d0 e04b66de96
commit e66197abab
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 {
name: "SPDX-license-identifier-CC-BY-ND",
conditions: ["restricted"],
conditions: ["by_exception_only"],
}
license_kind {
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",
}
license_kind {
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",
}
license_kind {
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",
}
license_kind {
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",
}
license_kind {
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",
}
@@ -562,7 +562,10 @@ license_kind {
license_kind {
name: "SPDX-license-identifier-CC-BY-SA-ND",
conditions: ["restricted"],
conditions: [
"restricted",
"by_exception_only",
],
}
license_kind {