From 61897684d597a9f80291a608e9f245083cea7b1e Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 19:52:52 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikey Added SPDX-license-identifier-Apache-2.0 to: audio/Android.mk bluetooth/Android.bp hifi/debug-hifi/Android.mk libmemtrack/Android.mk mali/bifrost/Android.mk mali/utgard/Android.mk recovery/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: power/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 to: gralloc/Android.bp gralloc/Android.mk gralloc960/Android.bp gralloc960/Android.mk Added SPDX-license-identifier-GPL-2.0 to: wpan/uim/Android.mk Added SPDX-license-identifier-MIT to: hifi/xaf/host-apf/Android.bp hifi/xaf/host-apf/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5414686a8063382cbec9a7d8b125c2a55c68c474 --- Android.bp | 31 +++++++++++++++++++++++++++++++ audio/Android.mk | 3 ++- bluetooth/Android.bp | 9 +++++++++ gralloc/Android.bp | 10 ++++++++++ gralloc/Android.mk | 2 ++ gralloc960/Android.bp | 10 ++++++++++ gralloc960/Android.mk | 2 ++ hifi/debug-hifi/Android.mk | 2 ++ hifi/xaf/host-apf/Android.bp | 9 +++++++++ hifi/xaf/host-apf/Android.mk | 7 ++++++- libmemtrack/Android.mk | 2 ++ mali/bifrost/Android.mk | 14 ++++++++++++-- mali/utgard/Android.mk | 6 ++++-- power/Android.mk | 2 ++ recovery/Android.bp | 9 +++++++++ wpan/uim/Android.mk | 3 ++- 16 files changed, 114 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index 6477ee96..1285317b 100644 --- a/Android.bp +++ b/Android.bp @@ -13,6 +13,37 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["device_linaro_hikey_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_hikey_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-MIT", + "legacy_unencumbered", + ], + // large-scale-change unable to identify any license_text files +} + subdirs = [ "bluetooth", "recovery", diff --git a/audio/Android.mk b/audio/Android.mk index 0a02789e..eb0732d7 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.$(TARGET_BOARD_PLATFORM) +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true @@ -48,4 +50,3 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := libxtensa_proxy endif include $(BUILD_SHARED_LIBRARY) - diff --git a/bluetooth/Android.bp b/bluetooth/Android.bp index e421c530..79fbcfb9 100644 --- a/bluetooth/Android.bp +++ b/bluetooth/Android.bp @@ -13,6 +13,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_linaro_hikey_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_linaro_hikey_license"], +} + cc_binary { name: "android.hardware.bluetooth@1.0-service.hikey", proprietary: true, diff --git a/gralloc/Android.bp b/gralloc/Android.bp index a198df52..44da39ed 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -1,3 +1,13 @@ +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_hikey_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-GPL-2.0 + default_applicable_licenses: ["device_linaro_hikey_license"], +} + cc_library_shared { name: "hwcomposer.drm_hikey", defaults: ["hwcomposer.drm_defaults"], diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 23a5a820..20b8f66d 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -29,6 +29,8 @@ LOCAL_VENDOR_MODULE := true MALI_DDK_TEST_PATH := hardware/arm/ LOCAL_MODULE := gralloc.hikey +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 +LOCAL_LICENSE_CONDITIONS := notice restricted LOCAL_MODULE_RELATIVE_PATH := hw #LOCAL_MODULE_TAGS := optional diff --git a/gralloc960/Android.bp b/gralloc960/Android.bp index 37d60a16..b8e39c51 100644 --- a/gralloc960/Android.bp +++ b/gralloc960/Android.bp @@ -1,3 +1,13 @@ +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_hikey_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-GPL-2.0 + default_applicable_licenses: ["device_linaro_hikey_license"], +} + cc_library_shared { name: "hwcomposer.drm_hikey960", defaults: ["hwcomposer.drm_defaults"], diff --git a/gralloc960/Android.mk b/gralloc960/Android.mk index 35bdb8f9..89f5857c 100644 --- a/gralloc960/Android.mk +++ b/gralloc960/Android.mk @@ -153,6 +153,8 @@ LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE := gralloc.hikey960 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 +LOCAL_LICENSE_CONDITIONS := notice restricted LOCAL_MODULE_TAGS := optional LOCAL_MULTILIB := both diff --git a/hifi/debug-hifi/Android.mk b/hifi/debug-hifi/Android.mk index 8e55d9ae..eefcaa58 100644 --- a/hifi/debug-hifi/Android.mk +++ b/hifi/debug-hifi/Android.mk @@ -16,6 +16,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := debug-hifi +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_SRC_FILES := debug-hifi.c include $(BUILD_EXECUTABLE) diff --git a/hifi/xaf/host-apf/Android.bp b/hifi/xaf/host-apf/Android.bp index 7bd20057..58875388 100644 --- a/hifi/xaf/host-apf/Android.bp +++ b/hifi/xaf/host-apf/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_linaro_hikey_license" + // to get the below license kinds: + // SPDX-license-identifier-MIT + default_applicable_licenses: ["device_linaro_hikey_license"], +} + cc_prebuilt_binary { name: "dhifimesg", srcs: ["tools/dhifimesg"], diff --git a/hifi/xaf/host-apf/Android.mk b/hifi/xaf/host-apf/Android.mk index 2bce8cf0..270c9aab 100644 --- a/hifi/xaf/host-apf/Android.mk +++ b/hifi/xaf/host-apf/Android.mk @@ -31,6 +31,8 @@ LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_C_INCLUDES += external/expat/lib LOCAL_CFLAGS := $(C_FLAGS) LOCAL_MODULE := libxtensa_proxy +LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) @@ -41,6 +43,8 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_VENDOR_MODULE := true LOCAL_MODULE := xaf-dec-test +LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := \ utest/xaf-dec-test.c @@ -58,6 +62,8 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_VENDOR_MODULE := true LOCAL_MODULE := xaf-dec-mix-test +LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := \ utest/xaf-dec-mix-test.c @@ -68,4 +74,3 @@ LOCAL_STATIC_LIBRARIES := libxtensa_proxy LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) - diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk index 629a5d6e..630281f2 100644 --- a/libmemtrack/Android.mk +++ b/libmemtrack/Android.mk @@ -26,5 +26,7 @@ LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES := liblog libhardware LOCAL_SRC_FILES := memtrack_hikey.c LOCAL_MODULE := memtrack.default +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice #LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM) include $(BUILD_SHARED_LIBRARY) diff --git a/mali/bifrost/Android.mk b/mali/bifrost/Android.mk index 4ea05a7e..0df1f5fc 100644 --- a/mali/bifrost/Android.mk +++ b/mali/bifrost/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := END_USER_LICENCE_AGREEMENT.txt +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := $(LOCAL_MODULE) @@ -12,6 +14,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libGLES_mali.so +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := lib/egl/$(LOCAL_MODULE) @@ -24,6 +28,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libbccArm.so +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE) @@ -36,6 +42,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libRSDriverArm.so +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := lib/$(LOCAL_MODULE) @@ -48,6 +56,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libmalicore.bc +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := lib/$(LOCAL_MODULE) @@ -59,6 +69,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := vulkan.hikey960.so +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := lib/hw/$(LOCAL_MODULE) @@ -73,5 +85,3 @@ LOCAL_CHECK_ELF_FILES := false include $(BUILD_PREBUILT) endif - - diff --git a/mali/utgard/Android.mk b/mali/utgard/Android.mk index 3e9ccec8..c7afa7b4 100644 --- a/mali/utgard/Android.mk +++ b/mali/utgard/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := END_USER_LICENCE_AGREEMENT.txt +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := $(LOCAL_MODULE) @@ -13,6 +15,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libGLES_mali.so +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES_arm := lib/egl/$(LOCAL_MODULE) @@ -24,5 +28,3 @@ LOCAL_SHARED_LIBRARIES := libc++ libc libdl liblog libm include $(BUILD_PREBUILT) endif - - diff --git a/power/Android.mk b/power/Android.mk index 76ff7893..0e08d0a8 100644 --- a/power/Android.mk +++ b/power/Android.mk @@ -24,6 +24,8 @@ LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := android.hardware.power@1.1-service.hikey-common +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_INIT_RC := android.hardware.power@1.1-service.hikey-common.rc LOCAL_SRC_FILES := service.cpp Power.cpp power_hikey.c diff --git a/recovery/Android.bp b/recovery/Android.bp index 0fd89068..c4b8df0b 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_linaro_hikey_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_linaro_hikey_license"], +} + cc_library_static { name: "librecovery_ui_hikey", owner: "linaro", diff --git a/wpan/uim/Android.mk b/wpan/uim/Android.mk index a7bd83c2..a91abdd9 100644 --- a/wpan/uim/Android.mk +++ b/wpan/uim/Android.mk @@ -8,7 +8,8 @@ LOCAL_SRC_FILES:= uim.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/ LOCAL_MODULE := uim +LOCAL_LICENSE_KINDS := SPDX-license-identifier-GPL-2.0 +LOCAL_LICENSE_CONDITIONS := restricted LOCAL_PROPRIETARY_MODULE := true include $(BUILD_EXECUTABLE) - -- cgit v1.2.3