AOSP: [LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogs

Added SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0
    SPDX-license-identifier-BSD SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-LGPL-2.0 SPDX-license-identifier-LGPL-2.1
    SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT
    legacy_notice legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-0BSD SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1
    SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT
    legacy_unencumbered
to:
  lib/Android.bp

Added SPDX-license-identifier-0BSD SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT
to:
  lib/et/Android.bp

Added SPDX-license-identifier-0BSD SPDX-license-identifier-MIT
to:
  lib/ss/Android.bp

Added SPDX-license-identifier-Apache-2.0
to:
  contrib/android/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
  contrib/Android.bp

Added SPDX-license-identifier-BSD
to:
  lib/uuid/Android.bp

Added SPDX-license-identifier-GPL
to:
  resize/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
to:
  debugfs/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL
to:
  e2fsck/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1
    SPDX-license-identifier-LGPL-3.0 legacy_unencumbered
to:
  lib/ext2fs/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-LGPL
to:
  lib/e2p/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-LGPL
    SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
to:
  lib/blkid/Android.bp
  misc/Android.bp

Added SPDX-license-identifier-GPL SPDX-license-identifier-MIT
to:
  lib/support/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I239a04a83f12ba051be911d18f6df4ae77fb3368
From AOSP commit: e86522c572b5715b85889cf8ca1c52a5cc350ca7

diff --git a/Android.bp b/Android.bp
index 79dd58e..f9c3b6f 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,45 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    default_applicable_licenses: ["external_e2fsprogs_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.
+// See: http://go/android-license-faq
+license {
+    name: "external_e2fsprogs_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-0BSD",
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+        "SPDX-license-identifier-LGPL-2.0",
+        "SPDX-license-identifier-LGPL-2.1",
+        "SPDX-license-identifier-LGPL-3.0",
+        "SPDX-license-identifier-MIT",
+        "legacy_notice",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 cc_defaults {
     name: "e2fsprogs-defaults",
     cflags: ["-Wall", "-Werror"],

diff --git a/contrib/Android.bp b/contrib/Android.bp
index 8bde657..5fb5545 100644 (file)
--- a/contrib/Android.bp
+++ b/contrib/Android.bp
@@ -1,5 +1,15 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-GPL
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 subdirs = ["android"]
 
 //########################################################################

diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
index b1fd0da..c33ebf4 100644 (file)
--- a/contrib/android/Android.bp
+++ b/contrib/android/Android.bp
@@ -3,6 +3,15 @@
 //##########################################################################
 // Build e2fsdroid
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_binary {
     name: "e2fsdroid",
     host_supported: true,

diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index b9f299b..dd146e4 100644 (file)
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -3,6 +3,16 @@
 //########################
 // Build the debugfs binary
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-GPL-2.0
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_defaults {
     name: "debugfs-defaults",
     defaults: ["e2fsprogs-defaults"],

diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 603e2ed..9882172 100644 (file)
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -3,6 +3,17 @@
 //########################
 // Build the e2fsck binary
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-GPL-2.0
+    //   SPDX-license-identifier-LGPL
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_defaults {
     name: "e2fsck-defaults",
     defaults: ["e2fsprogs-defaults"],

diff --git a/lib/Android.bp b/lib/Android.bp
index 01f6c3d..fb0ea07 100644 (file)
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -3,6 +3,23 @@
 // All the libraries under this directory export their headers as relative
 // paths to this directory (external/e2fsprogs/lib). This is a helper headers
 // only library to allow exporting
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-0BSD
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-GPL-2.0
+    //   SPDX-license-identifier-LGPL
+    //   SPDX-license-identifier-LGPL-2.1
+    //   SPDX-license-identifier-LGPL-3.0
+    //   SPDX-license-identifier-MIT
+    //   legacy_unencumbered
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library_headers {
     name: "libext2-headers",
     host_supported: true,

diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
index 64aef6f..9e0e291 100644 (file)
--- a/lib/blkid/Android.bp
+++ b/lib/blkid/Android.bp
@@ -1,5 +1,17 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-LGPL
+    //   SPDX-license-identifier-LGPL-2.1
+    //   SPDX-license-identifier-LGPL-3.0
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_blkid",
     host_supported: true,

diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp
index 2a70972..566afd2 100644 (file)
--- a/lib/e2p/Android.bp
+++ b/lib/e2p/Android.bp
@@ -1,5 +1,15 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-LGPL
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_e2p",
     host_supported: true,

diff --git a/lib/et/Android.bp b/lib/et/Android.bp
index f74f7f0..07f3c27 100644 (file)
--- a/lib/et/Android.bp
+++ b/lib/et/Android.bp
@@ -1,5 +1,17 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-0BSD
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-GPL-2.0
+    //   SPDX-license-identifier-MIT
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_com_err",
     host_supported: true,

diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
index fd5c4df..919adb1 100644 (file)
--- a/lib/ext2fs/Android.bp
+++ b/lib/ext2fs/Android.bp
@@ -1,5 +1,19 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-GPL-2.0
+    //   SPDX-license-identifier-LGPL
+    //   SPDX-license-identifier-LGPL-2.1
+    //   SPDX-license-identifier-LGPL-3.0
+    //   legacy_unencumbered
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2fs",
     host_supported: true,

diff --git a/lib/ss/Android.bp b/lib/ss/Android.bp
index 0933251..ebc1e1a 100644 (file)
--- a/lib/ss/Android.bp
+++ b/lib/ss/Android.bp
@@ -1,5 +1,15 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-0BSD
+    //   SPDX-license-identifier-MIT
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_ss",
     host_supported: true,

diff --git a/lib/support/Android.bp b/lib/support/Android.bp
index 4813426..a0b064d 100644 (file)
--- a/lib/support/Android.bp
+++ b/lib/support/Android.bp
@@ -1,5 +1,15 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-MIT
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_quota",
     host_supported: true,

diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp
index b560969..67968db 100644 (file)
--- a/lib/uuid/Android.bp
+++ b/lib/uuid/Android.bp
@@ -1,5 +1,22 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    default_applicable_licenses: ["external_e2fsprogs_lib_uuid_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_e2fsprogs_lib_uuid_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+    ],
+    license_text: [
+        "COPYING",
+    ],
+}
+
 cc_library {
     name: "libext2_uuid",
     host_supported: true,

diff --git a/misc/Android.bp b/misc/Android.bp
index 757381d..ca4267b 100644 (file)
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -2,6 +2,18 @@
 
 // Library used to export files from this directory to other programs in this
 // project.
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    //   SPDX-license-identifier-LGPL
+    //   SPDX-license-identifier-LGPL-2.1
+    //   SPDX-license-identifier-LGPL-3.0
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 cc_library {
     name: "libext2_misc",
     host_supported: true,

diff --git a/resize/Android.bp b/resize/Android.bp
index 8e269c7..fe72824 100644 (file)
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -1,5 +1,14 @@
 // Copyright 2017 The Android Open Source Project
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_e2fsprogs_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-GPL
+    default_applicable_licenses: ["external_e2fsprogs_license"],
+}
+
 resize2fs_libs = [
     "libext2fs",
     "libext2_com_err",