diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-12 19:52:52 -0800 |
|---|---|---|
| committer | Bob Badour <bbadour@google.com> | 2021-02-12 19:52:52 -0800 |
| commit | 61897684d597a9f80291a608e9f245083cea7b1e (patch) | |
| tree | 171a01022fe3a72ead27b0358773c6aa9e5168cd /gralloc960 | |
| parent | fbd395ff6ec848a45914b5604f25d96c532d5dc9 (diff) | |
| download | hikey-61897684d597a9f80291a608e9f245083cea7b1e.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikeyandroid-s-preview-1
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
Diffstat (limited to 'gralloc960')
| -rw-r--r-- | gralloc960/Android.bp | 10 | ||||
| -rw-r--r-- | gralloc960/Android.mk | 2 |
2 files changed, 12 insertions, 0 deletions
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 |