diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 00:31:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 00:31:43 +0000 |
commit | 418fe29599d4e4c1f84d113b884754a197446934 (patch) | |
tree | 7a2dd29801e931b8966c0c12781b3c6ebed97b59 | |
parent | 47f8fe41a5fe091466505bb847d1a8403f3e170b (diff) | |
parent | 00e273ce8e1b638fc4fe65b3a5a3ed99f04c6c6c (diff) | |
download | poplar-418fe29599d4e4c1f84d113b884754a197446934.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/poplar am: 5a2d84d6ea am: 00e273ce8e
Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/1589093
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89da6937f77a663bc2445f1d1719eaa5a691f5d1
-rw-r--r-- | Android.bp | 47 | ||||
-rw-r--r-- | audio/Android.mk | 3 | ||||
-rw-r--r-- | proprietary/Android.bp | 13 | ||||
-rw-r--r-- | proprietary/bt-wifi/Android.bp | 13 | ||||
-rw-r--r-- | proprietary/hisilicon/Android.bp | 35 | ||||
-rw-r--r-- | wifi/wifi_hal/Android.mk | 3 | ||||
-rw-r--r-- | wifi/wpa_supplicant_8_lib/Android.mk | 3 |
7 files changed, 115 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..66e8948 --- /dev/null +++ b/Android.bp @@ -0,0 +1,47 @@ +// +// 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. + +// *** 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: ["device_linaro_poplar_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_linaro_poplar_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "legacy_by_exception_only", // by exception only + "legacy_proprietary", // by exception only + ], + // large-scale-change unable to identify any license_text files +} diff --git a/audio/Android.mk b/audio/Android.mk index 0bf5590..e97f56d 100644 --- a/audio/Android.mk +++ b/audio/Android.mk @@ -24,6 +24,8 @@ include $(CLEAR_VARS) LOCAL_HEADER_LIBRARIES += libhardware_headers LOCAL_MODULE := audio.primary.poplar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true @@ -37,4 +39,3 @@ LOCAL_C_INCLUDES += \ system/media/audio_effects/include include $(BUILD_SHARED_LIBRARY) - diff --git a/proprietary/Android.bp b/proprietary/Android.bp index a90bdbc..67d6860 100644 --- a/proprietary/Android.bp +++ b/proprietary/Android.bp @@ -14,3 +14,16 @@ soong_namespace { } + +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_linaro_poplar_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + // legacy_proprietary (by exception only) + default_applicable_licenses: ["device_linaro_poplar_license"], +} diff --git a/proprietary/bt-wifi/Android.bp b/proprietary/bt-wifi/Android.bp index 4b4e5dd..035c27e 100644 --- a/proprietary/bt-wifi/Android.bp +++ b/proprietary/bt-wifi/Android.bp @@ -12,6 +12,19 @@ // 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_linaro_poplar_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + // legacy_proprietary (by exception only) + default_applicable_licenses: ["device_linaro_poplar_license"], +} + cc_prebuilt_library_shared { name: "libbt-vendor", srcs: ["libbt-vendor.so"], diff --git a/proprietary/hisilicon/Android.bp b/proprietary/hisilicon/Android.bp index 5fe5e8e..911b3de 100644 --- a/proprietary/hisilicon/Android.bp +++ b/proprietary/hisilicon/Android.bp @@ -12,6 +12,41 @@ // 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: [ + "device_linaro_poplar_proprietary_hisilicon_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_linaro_poplar_proprietary_hisilicon_license", + visibility: [":__subpackages__"], + license_kinds: [ + "legacy_by_exception_only", // by exception only + "legacy_proprietary", // by exception only + ], + license_text: [ + "LICENSE", + ], +} + cc_prebuilt_library_shared { name: "gralloc.poplar", srcs: ["gralloc.poplar.so"], diff --git a/wifi/wifi_hal/Android.mk b/wifi/wifi_hal/Android.mk index f56bfc4..a466524 100644 --- a/wifi/wifi_hal/Android.mk +++ b/wifi/wifi_hal/Android.mk @@ -46,7 +46,8 @@ LOCAL_SRC_FILES := \ wifi_offload.cpp LOCAL_MODULE := libwifi-hal-rtl +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_PROPRIETARY_MODULE := true include $(BUILD_STATIC_LIBRARY) - diff --git a/wifi/wpa_supplicant_8_lib/Android.mk b/wifi/wpa_supplicant_8_lib/Android.mk index 0d8a47f..c6393ca 100644 --- a/wifi/wpa_supplicant_8_lib/Android.mk +++ b/wifi/wpa_supplicant_8_lib/Android.mk @@ -62,6 +62,9 @@ L_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-macro-redefined include $(CLEAR_VARS) LOCAL_MODULE := lib_driver_cmd_rtl +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(WPA_SRC_FILE) |