diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 00:31:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 00:31:34 +0000 |
commit | 121ad753c14a7e924953748ff7c594d7513a530e (patch) | |
tree | a55ade791d7c5e32ca86a8d17d7014fc5bcd4e82 | |
parent | d7c7920735104d7a68af72cf21ae440120288281 (diff) | |
parent | 6171cebc20e27697138b731d68e90bbbbb2d89e0 (diff) | |
download | atv-121ad753c14a7e924953748ff7c594d7513a530e.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to device/google/atv am: 63c619411a am: 6171cebc20
Original change: https://android-review.googlesource.com/c/device/google/atv/+/1588969
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05ed5c66c3f4afcd6454cd4ef464b337e03420a4
-rw-r--r-- | Android.bp | 42 | ||||
-rw-r--r-- | LeanbackSampleApp/Android.mk | 2 | ||||
-rw-r--r-- | TvProvision/Android.bp | 9 | ||||
-rw-r--r-- | TvSampleLeanbackLauncher/Android.bp | 9 | ||||
-rw-r--r-- | audio_proxy/Android.bp | 9 | ||||
-rw-r--r-- | audio_proxy/interfaces/5.0/Android.bp | 10 | ||||
-rw-r--r-- | audio_proxy/interfaces/Android.bp | 9 | ||||
-rw-r--r-- | audio_proxy/service/Android.bp | 9 |
8 files changed, 98 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..80433fd --- /dev/null +++ b/Android.bp @@ -0,0 +1,42 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["device_google_atv_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_google_atv_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_notice", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/LeanbackSampleApp/Android.mk b/LeanbackSampleApp/Android.mk index a9c0737..de1de0a 100644 --- a/LeanbackSampleApp/Android.mk +++ b/LeanbackSampleApp/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := LeanbackSampleApp +LOCAL_LICENSE_KINDS := legacy_notice +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_TAGS := optional diff --git a/TvProvision/Android.bp b/TvProvision/Android.bp index ed00008..f32673b 100644 --- a/TvProvision/Android.bp +++ b/TvProvision/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_atv_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_atv_license"], +} + prebuilt_etc { name: "privapp_whitelist_com.android.tv.provision", product_specific: true, diff --git a/TvSampleLeanbackLauncher/Android.bp b/TvSampleLeanbackLauncher/Android.bp index 9c09168..8b525f0 100644 --- a/TvSampleLeanbackLauncher/Android.bp +++ b/TvSampleLeanbackLauncher/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_atv_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_atv_license"], +} + prebuilt_etc { name: "privapp_whitelist_com.example.sampleleanbacklauncher", product_specific: true, diff --git a/audio_proxy/Android.bp b/audio_proxy/Android.bp index 8bf624b..2f7e00a 100644 --- a/audio_proxy/Android.bp +++ b/audio_proxy/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_atv_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_atv_license"], +} + cc_library { name: "libaudio_proxy.google", diff --git a/audio_proxy/interfaces/5.0/Android.bp b/audio_proxy/interfaces/5.0/Android.bp index 05d48fe..ab3ca26 100644 --- a/audio_proxy/interfaces/5.0/Android.bp +++ b/audio_proxy/interfaces/5.0/Android.bp @@ -1,5 +1,14 @@ // This file is autogenerated by hidl-gen -Landroidbp. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_atv_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["device_google_atv_license"], +} + hidl_interface { name: "device.google.atv.audio_proxy@5.0", root: "device.google.atv.audio_proxy", @@ -16,4 +25,3 @@ hidl_interface { ], gen_java: false, } - diff --git a/audio_proxy/interfaces/Android.bp b/audio_proxy/interfaces/Android.bp index 89d436a..1a15b5e 100644 --- a/audio_proxy/interfaces/Android.bp +++ b/audio_proxy/interfaces/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_atv_license" + // to get the below license kinds: + // legacy_notice + default_applicable_licenses: ["device_google_atv_license"], +} + hidl_package_root { name: "device.google.atv.audio_proxy", path: "device/google/atv/audio_proxy/interfaces", diff --git a/audio_proxy/service/Android.bp b/audio_proxy/service/Android.bp index fa2bfb6..7ff75e3 100644 --- a/audio_proxy/service/Android.bp +++ b/audio_proxy/service/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 "device_google_atv_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_atv_license"], +} + cc_binary { name: "device.google.atv.audio_proxy@5.0-service", vendor: true, |