aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 23:18:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 23:18:00 +0000
commit019ffc9820a67439ad16b5a6589e2bc00a5bfb3a (patch)
tree23ea2b81bcd294228cd9c2c415b6d155207758be
parent307741c84ee5f6c195553752f015a43cc41480ae (diff)
parentd9bd18f0415126fc1f6f2fc6e4cd01c8fdbb9fb2 (diff)
downloadImageMagick-019ffc9820a67439ad16b5a6589e2bc00a5bfb3a.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to external/ImageMagick am: b6c094cecf am: ee5af6094c am: 40345256dc am: d9bd18f041
Original change: https://android-review.googlesource.com/c/platform/external/ImageMagick/+/1588900 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b0d404b69202ece101b881c4dd21dc0d14e3172
-rw-r--r--Android.bp39
-rw-r--r--Magick++/Android.bp17
-rw-r--r--MagickCore/Android.bp11
-rw-r--r--MagickWand/Android.bp10
-rw-r--r--coders/Android.bp11
-rw-r--r--filters/Android.bp12
6 files changed, 100 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 722afd222..db62fa760 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,42 @@
+package {
+ default_applicable_licenses: ["external_ImageMagick_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_ImageMagick_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-MIT",
+ "legacy_notice",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "LICENSE",
+ "NOTICE",
+ ],
+}
+
cc_library_headers {
name: "Magick_headers",
export_include_dirs: ["."],
diff --git a/Magick++/Android.bp b/Magick++/Android.bp
index 0642099c8..918ebbb34 100644
--- a/Magick++/Android.bp
+++ b/Magick++/Android.bp
@@ -12,6 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["external_ImageMagick_Magick++_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "external_ImageMagick_Magick++_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
cc_library_static {
name: "Magick++",
diff --git a/MagickCore/Android.bp b/MagickCore/Android.bp
index c52dfda5d..c0f3ae97b 100644
--- a/MagickCore/Android.bp
+++ b/MagickCore/Android.bp
@@ -12,6 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_ImageMagick_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // legacy_notice
+ default_applicable_licenses: ["external_ImageMagick_license"],
+}
+
cc_library_static {
name: "MagickCore",
diff --git a/MagickWand/Android.bp b/MagickWand/Android.bp
index 205cf19c9..8e1f69d00 100644
--- a/MagickWand/Android.bp
+++ b/MagickWand/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_ImageMagick_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ // legacy_notice
+ default_applicable_licenses: ["external_ImageMagick_license"],
+}
+
cc_library_static {
name: "MagickWand",
diff --git a/coders/Android.bp b/coders/Android.bp
index 6d3fb8957..3de94b0e4 100644
--- a/coders/Android.bp
+++ b/coders/Android.bp
@@ -12,6 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_ImageMagick_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // legacy_notice
+ default_applicable_licenses: ["external_ImageMagick_license"],
+}
+
cc_library_static {
name: "Magick_coders",
diff --git a/filters/Android.bp b/filters/Android.bp
index af29fdcae..33152589f 100644
--- a/filters/Android.bp
+++ b/filters/Android.bp
@@ -12,6 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_ImageMagick_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // legacy_notice
+ // legacy_unencumbered
+ default_applicable_licenses: ["external_ImageMagick_license"],
+}
+
cc_library_static {
name: "Magick_filters",