Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e66197ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CC-BY-ND licenses" am: 2b244217 am: 444727a2 am: e04b66de 

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

Change-Id: I5b6a5109058b4c81c9fe91a10db0290730967c1c
parents 501f02c3 e04b66de

licenses/Android.bp

+10 −7
Original line number Diff line number Diff line
@@ -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 {