diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-11 23:46:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-11 23:46:44 +0000 |
| commit | 3bb62fe982ceae60dcd4ba9e105d29989f91bf1b (patch) | |
| tree | 773ad65889f11c42626cc99ffb26c99e1c5d5de5 | |
| parent | a67690eec9285e2306f6f0275fb946a09b2e6465 (diff) | |
| parent | 34883707c1cd3d10a31fe2c872a6c9610441ab9a (diff) | |
| download | gchips-3bb62fe982ceae60dcd4ba9e105d29989f91bf1b.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/gchips" into sc-dev
| -rw-r--r-- | gralloc3/Android.mk | 2 | ||||
| -rw-r--r-- | gralloc3/src/Android.mk | 10 | ||||
| -rw-r--r-- | libexynosutils/Android.mk | 3 | ||||
| -rw-r--r-- | videoapi/Android.mk | 2 |
4 files changed, 17 insertions, 0 deletions
diff --git a/gralloc3/Android.mk b/gralloc3/Android.mk index 0e42fc9..5e6623e 100644 --- a/gralloc3/Android.mk +++ b/gralloc3/Android.mk @@ -111,5 +111,7 @@ ifeq ($(BOARD_USES_VENDORIMAGE), true) LOCAL_PROPRIETARY_MODULE := true endif LOCAL_MODULE := libGrallocWrapper +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice include $(BUILD_SHARED_LIBRARY) diff --git a/gralloc3/src/Android.mk b/gralloc3/src/Android.mk index 76e235d..8ec1bca 100644 --- a/gralloc3/src/Android.mk +++ b/gralloc3/src/Android.mk @@ -260,18 +260,28 @@ LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 ifeq ($(shell expr $(GRALLOC_VERSION_MAJOR) \<= 1), 1) ifeq ($(TARGET_BOARD_PLATFORM),) LOCAL_MODULE := gralloc.default + LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS := notice else LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) + LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS := notice endif else ifeq ($(GRALLOC_VERSION_MAJOR), 2) ifeq ($(GRALLOC_MAPPER), 1) ifeq ($(HIDL_MAPPER_VERSION_SCALED), 200) LOCAL_MODULE := android.hardware.graphics.mapper@2.0-impl + LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS := notice else ifeq ($(HIDL_MAPPER_VERSION_SCALED), 210) LOCAL_MODULE := android.hardware.graphics.mapper@2.0-impl-2.1 + LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS := notice endif else LOCAL_MODULE := android.hardware.graphics.allocator@2.0-impl + LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 + LOCAL_LICENSE_CONDITIONS := notice endif endif diff --git a/libexynosutils/Android.mk b/libexynosutils/Android.mk index 5168295..59f3970 100644 --- a/libexynosutils/Android.mk +++ b/libexynosutils/Android.mk @@ -30,6 +30,9 @@ LOCAL_SRC_FILES := ExynosMutex.cpp \ Exynos_log.c LOCAL_MODULE := libexynosutils +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SRC_FILES += exynos_format_v4l2.c LOCAL_C_INCLUDES += \ diff --git a/videoapi/Android.mk b/videoapi/Android.mk index dbb21e4..c877d03 100644 --- a/videoapi/Android.mk +++ b/videoapi/Android.mk @@ -30,6 +30,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils LOCAL_MODULE := libVendorVideoApi +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_PRELINK_MODULE := false LOCAL_ARM_MODE := arm |