diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:00 +0000 |
| commit | 7979e58e431d5cdefea52820b008d3530aa73b2c (patch) | |
| tree | a2ba563355ad3182546a902988b459ba874f00dc | |
| parent | 20c80062803df0aff9871996b1059cbce24e8c57 (diff) | |
| parent | b0f9643dff1d3bae4d33d7c6ad05d9827cc407fd (diff) | |
| download | media-7979e58e431d5cdefea52820b008d3530aa73b2c.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/media am: 5390cef1c3 am: 2066741890 am: b0f9643dff
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1588041
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c447f94fac9380d858e2982eb7318ff930eb426
| -rwxr-xr-x | libc2dcolorconvert/Android.mk | 3 | ||||
| -rw-r--r-- | libplatformconfig/Android.mk | 3 | ||||
| -rwxr-xr-x | libstagefrighthw/Android.mk | 4 | ||||
| -rwxr-xr-x | mm-core/Android.mk | 6 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 3 | ||||
| -rwxr-xr-x | mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 |
7 files changed, 30 insertions, 1 deletions
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 4cda9c8c..ed4c4741 100755 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -20,6 +20,9 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libc2dcolorconvert +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_VENDOR_MODULE := true diff --git a/libplatformconfig/Android.mk b/libplatformconfig/Android.mk index 97c89f69..ac4de361 100644 --- a/libplatformconfig/Android.mk +++ b/libplatformconfig/Android.mk @@ -34,6 +34,9 @@ LOCAL_SRC_FILES := PlatformConfig.cpp LOCAL_SRC_FILES += ConfigParser.cpp LOCAL_MODULE := libplatformconfig +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 41794158..b9060ce3 100755 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -54,8 +54,10 @@ LOCAL_HEADER_LIBRARIES := \ media_plugin_headers LOCAL_MODULE := libstagefrighthw +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) - diff --git a/mm-core/Android.mk b/mm-core/Android.mk index c9cb62aa..f43507b4 100755 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -70,6 +70,9 @@ LOCAL_HEADER_LIBRARIES := \ LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libOmxCore +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils @@ -102,6 +105,9 @@ LOCAL_HEADER_LIBRARIES := \ LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libmm-omxcore +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index c70d04e0..af8da778 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -27,6 +27,9 @@ libmm-vidc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_MODULE := libOmxVidcCommon +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS := $(libmm-vidc-def) diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index 3f8fa799..908a457c 100755 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -92,6 +92,9 @@ libmm-vdec-def += -DALLOCATE_OUTPUT_NATIVEHANDLE include $(CLEAR_VARS) LOCAL_MODULE := libOmxVdec +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) -Werror @@ -134,6 +137,9 @@ ifneq "$(wildcard $(QCPATH) )" "" ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_NEED_SW_VDEC)),true) LOCAL_MODULE := libOmxSwVdec +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index 53973606..b2b305af 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -81,6 +81,9 @@ libmm-venc-add-dep := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr include $(CLEAR_VARS) LOCAL_MODULE := libOmxVenc +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-venc-def) @@ -126,6 +129,9 @@ include $(CLEAR_VARS) libmm-venc-inc += $(TARGET_OUT_HEADERS)/mm-video/swvenc LOCAL_MODULE := libOmxSwVencMpeg4 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true |