diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-30 04:35:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-30 04:35:03 +0000 |
commit | 82296e8fcb6ebda74d67a5668c93f81734fcacc6 (patch) | |
tree | fd8b53bde744747afef7fddeec3cded5e2aa9994 | |
parent | 972d7735fec3ff89ee1aecbc31a1acf1338a1147 (diff) | |
parent | b2450e1304b940e2b2cffe434d010d5c2a84596c (diff) | |
download | beagle-x15-82296e8fcb6ebda74d67a5668c93f81734fcacc6.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to device/ti/beagle_x15" am: b2450e1304android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1654829
Change-Id: I031953f930a1a7517d0ccebbd87182e584d3c8b0
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | build/tasks/boot_fit.mk | 2 | ||||
-rw-r--r-- | build/tasks/dtimages.mk | 4 | ||||
-rw-r--r-- | gpu/Android.bp | 30 | ||||
-rw-r--r-- | gralloc/Android.bp | 11 | ||||
-rw-r--r-- | recovery/Android.bp | 9 |
6 files changed, 85 insertions, 0 deletions
@@ -13,3 +13,32 @@ // limitations under the License. soong_namespace {} + +package { + default_applicable_licenses: ["device_ti_beagle_x15_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: "device_ti_beagle_x15_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/build/tasks/boot_fit.mk b/build/tasks/boot_fit.mk index 225e2d4..f2becde 100644 --- a/build/tasks/boot_fit.mk +++ b/build/tasks/boot_fit.mk @@ -30,6 +30,8 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := bootfitimage +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(BOOTIMG_FIT) include $(BUILD_PHONY_PACKAGE) diff --git a/build/tasks/dtimages.mk b/build/tasks/dtimages.mk index 19ebede..b54577d 100644 --- a/build/tasks/dtimages.mk +++ b/build/tasks/dtimages.mk @@ -28,11 +28,15 @@ $(DTBOIMAGE): $(DTBO_FILES) include $(CLEAR_VARS) LOCAL_MODULE := dtbimage +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(DTBIMAGE) include $(BUILD_PHONY_PACKAGE) include $(CLEAR_VARS) LOCAL_MODULE := dtboimage +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_ADDITIONAL_DEPENDENCIES := $(DTBOIMAGE) include $(BUILD_PHONY_PACKAGE) diff --git a/gpu/Android.bp b/gpu/Android.bp index 0d8941e..e9f04a7 100644 --- a/gpu/Android.bp +++ b/gpu/Android.bp @@ -15,6 +15,36 @@ // Core dependencies +package { + default_applicable_licenses: ["device_ti_beagle_x15_gpu_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: "device_ti_beagle_x15_gpu_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + ], + license_text: [ + "NOTICE", + ], +} + cc_prebuilt_library_shared { name: "libIMGegl", srcs: ["libIMGegl.so"], diff --git a/gralloc/Android.bp b/gralloc/Android.bp index 30c0402..64cecff 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -1,3 +1,14 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_ti_beagle_x15_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-MIT + default_applicable_licenses: ["device_ti_beagle_x15_license"], +} + cc_library_shared { name: "hwcomposer.drm_imagination", defaults: ["hwcomposer.drm_defaults"], diff --git a/recovery/Android.bp b/recovery/Android.bp index b2eab67..373445a 100644 --- a/recovery/Android.bp +++ b/recovery/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 "device_ti_beagle_x15_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_ti_beagle_x15_license"], +} + cc_library_static { name: "librecovery_ui_beagle_x15", owner: "ti", |