diff options
author | Bob Badour <bbadour@google.com> | 2022-02-15 02:00:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-15 02:00:12 +0000 |
commit | 7a06083ebce6cf08228bcdae57113d55b70317a6 (patch) | |
tree | 82770fb8192bf3636be8a48f7743fce8bd072341 | |
parent | 3a6d964387d5f99b7d17cfeb870aeea6036ad08d (diff) | |
parent | 8c9fedfecd369fa71b5477032da5f851c17e6221 (diff) | |
download | beagle-x15-7a06083ebce6cf08228bcdae57113d55b70317a6.tar.gz |
Declare license metadata for copied files. am: 8c9fedfecd
Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1984533
Change-Id: If8acb7d141edc3421e8e507f65a5b34132bef3cc
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | gpu/Android.bp | 13 | ||||
-rw-r--r-- | gralloc/Android.bp | 8 | ||||
-rw-r--r-- | recovery/Android.bp | 6 |
5 files changed, 7 insertions, 51 deletions
@@ -15,30 +15,5 @@ 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 + default_applicable_licenses: ["Android-Apache-2.0"], } @@ -22,6 +22,10 @@ ifneq ($(filter beagle_x15%, $(TARGET_DEVICE)),) +$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,.rc)) +$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,.xml)) +$(eval $(call declare-1p-copy-files,device/ti/beagle_x15/,fstab.beagle_x15board)) + LOCAL_PATH := $(call my-dir) # if some modules are built directly from this directory (not subdirectories), diff --git a/gpu/Android.bp b/gpu/Android.bp index e9f04a7..ba395c0 100644 --- a/gpu/Android.bp +++ b/gpu/Android.bp @@ -19,19 +19,6 @@ 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", diff --git a/gralloc/Android.bp b/gralloc/Android.bp index cf24ace..0ad369b 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -1,12 +1,6 @@ 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"], + default_applicable_licenses: ["Android-Apache-2.0"], } cc_library_shared { diff --git a/recovery/Android.bp b/recovery/Android.bp index 373445a..6096fac 100644 --- a/recovery/Android.bp +++ b/recovery/Android.bp @@ -16,11 +16,7 @@ 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"], + default_applicable_licenses: ["Android-Apache-2.0"], } cc_library_static { |