From 29be3f6ef1b9f9884206cade2fc98b3f012ef27e Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 18:00:57 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery Added SPDX-license-identifier-Apache-2.0 to: applypatch/Android.bp bootloader_message/Android.bp edify/Android.bp fuse_sideload/Android.bp install/Android.bp minadbd/Android.bp minui/Android.bp otautil/Android.bp recovery_ui/Android.bp recovery_utils/Android.bp tests/Android.bp tools/image_generator/Android.bp tools/recovery_l10n/Android.bp uncrypt/Android.bp update_verifier/Android.bp updater/Android.bp updater/Android.mk updater_sample/Android.bp updater_sample/tests/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL to: Android.bp Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I3da761b525452838977297f773974000d4de7bd6 --- Android.bp | 34 ++++++++++++++++++++++++++++++++++ Android.mk | 6 ++++++ applypatch/Android.bp | 17 +++++++++++++++++ bootloader_message/Android.bp | 9 +++++++++ edify/Android.bp | 9 +++++++++ fuse_sideload/Android.bp | 9 +++++++++ install/Android.bp | 9 +++++++++ minadbd/Android.bp | 9 +++++++++ minui/Android.bp | 9 +++++++++ otautil/Android.bp | 9 +++++++++ recovery_ui/Android.bp | 9 +++++++++ recovery_utils/Android.bp | 9 +++++++++ tests/Android.bp | 9 +++++++++ tools/image_generator/Android.bp | 9 +++++++++ tools/recovery_l10n/Android.bp | 9 +++++++++ uncrypt/Android.bp | 9 +++++++++ update_verifier/Android.bp | 9 +++++++++ updater/Android.bp | 9 +++++++++ updater/Android.mk | 3 +++ updater_sample/Android.bp | 9 +++++++++ updater_sample/tests/Android.bp | 9 +++++++++ 21 files changed, 213 insertions(+) diff --git a/Android.bp b/Android.bp index bd2d0b0b2..52de77038 100644 --- a/Android.bp +++ b/Android.bp @@ -12,6 +12,40 @@ // See the License for the specific language governing permissions and // limitations under the License. +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + default_applicable_licenses: ["bootable_recovery_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: "bootable_recovery_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-OFL", // by exception only + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "recovery_defaults", diff --git a/Android.mk b/Android.mk index 58167491a..96af417bf 100644 --- a/Android.mk +++ b/Android.mk @@ -28,6 +28,9 @@ TARGET_RECOVERY_UI_LIB ?= librecovery_ui_default include $(CLEAR_VARS) LOCAL_MODULE := librecovery_ui_ext +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL +LOCAL_LICENSE_CONDITIONS := by_exception_only notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE # LOCAL_MODULE_PATH for shared libraries is unsupported in multiarch builds. LOCAL_MULTILIB := first @@ -54,6 +57,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := recovery_deps +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-OFL +LOCAL_LICENSE_CONDITIONS := by_exception_only notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) LOCAL_REQUIRED_MODULES += \ diff --git a/applypatch/Android.bp b/applypatch/Android.bp index a6662c460..0d6d23b90 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp @@ -12,6 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["bootable_recovery_applypatch_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "bootable_recovery_applypatch_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "applypatch_defaults", diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index 6443a077c..778fdb93e 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -14,6 +14,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "libbootloader_message_defaults", srcs: ["bootloader_message.cpp"], diff --git a/edify/Android.bp b/edify/Android.bp index 0ab53d6dd..62ff91133 100644 --- a/edify/Android.bp +++ b/edify/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_library_static { name: "libedify", diff --git a/fuse_sideload/Android.bp b/fuse_sideload/Android.bp index 9bf19eb85..4eb21dce8 100644 --- a/fuse_sideload/Android.bp +++ b/fuse_sideload/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_library { name: "libfusesideload", recovery_available: true, diff --git a/install/Android.bp b/install/Android.bp index bed3bc504..8c88bd01e 100644 --- a/install/Android.bp +++ b/install/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "libinstall_defaults", diff --git a/minadbd/Android.bp b/minadbd/Android.bp index fb51a799a..2bcfece40 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "minadbd_defaults", diff --git a/minui/Android.bp b/minui/Android.bp index 82588167c..f68f6c81d 100644 --- a/minui/Android.bp +++ b/minui/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_library { name: "libminui", recovery_available: true, diff --git a/otautil/Android.bp b/otautil/Android.bp index 3b3f9cbc4..557b8a313 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_library_static { name: "libotautil", diff --git a/recovery_ui/Android.bp b/recovery_ui/Android.bp index c9616ec15..f64b0d1c9 100644 --- a/recovery_ui/Android.bp +++ b/recovery_ui/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_library { name: "librecovery_ui", recovery_available: true, diff --git a/recovery_utils/Android.bp b/recovery_utils/Android.bp index bf79a2e87..e0e9ec058 100644 --- a/recovery_utils/Android.bp +++ b/recovery_utils/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "librecovery_utils_defaults", diff --git a/tests/Android.bp b/tests/Android.bp index d2179e494..0559dc3b9 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "recovery_test_defaults", diff --git a/tools/image_generator/Android.bp b/tools/image_generator/Android.bp index 83000407c..c9748fade 100644 --- a/tools/image_generator/Android.bp +++ b/tools/image_generator/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + java_library_host { name: "RecoveryImageGenerator", diff --git a/tools/recovery_l10n/Android.bp b/tools/recovery_l10n/Android.bp index d0a6d4b47..ac08e1a5b 100644 --- a/tools/recovery_l10n/Android.bp +++ b/tools/recovery_l10n/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + android_app { name: "RecoveryLocalizer", diff --git a/uncrypt/Android.bp b/uncrypt/Android.bp index 107a7f0fc..fbb4c1f03 100644 --- a/uncrypt/Android.bp +++ b/uncrypt/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_binary { name: "uncrypt", diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index f6567137e..f9a834185 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "update_verifier_defaults", diff --git a/updater/Android.bp b/updater/Android.bp index f00a192b9..840e50ab9 100644 --- a/updater/Android.bp +++ b/updater/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + cc_defaults { name: "libupdater_static_libs", diff --git a/updater/Android.mk b/updater/Android.mk index 46300d974..ddd4d864a 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -72,6 +72,9 @@ endef include $(CLEAR_VARS) LOCAL_MODULE := updater +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_SRC_FILES := \ updater_main.cpp diff --git a/updater_sample/Android.bp b/updater_sample/Android.bp index a014248b0..9222d0631 100644 --- a/updater_sample/Android.bp +++ b/updater_sample/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + android_app { name: "SystemUpdaterSample", sdk_version: "system_current", diff --git a/updater_sample/tests/Android.bp b/updater_sample/tests/Android.bp index 806babd9e..4bdfe2cdf 100644 --- a/updater_sample/tests/Android.bp +++ b/updater_sample/tests/Android.bp @@ -12,6 +12,15 @@ // 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 "bootable_recovery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["bootable_recovery_license"], +} + android_test { name: "SystemUpdaterSampleTests", sdk_version: "system_current", -- cgit v1.2.3