diff options
author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:09 +0000 |
commit | 59f342d58ba1024b158c677b8c3f99ff266f1267 (patch) | |
tree | 6f7273bf78fa680dccc8b7b4a685cca101c98050 | |
parent | 8d1b0b877e7113b5d6014f64d1a58f58ebc63f0c (diff) | |
parent | 3071d67c507ec6ad2222bbe2d9e9d3f438b402f7 (diff) | |
download | media-59f342d58ba1024b158c677b8c3f99ff266f1267.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20 am: 2cd15a53b9 am: 3071d67c50
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id88747a76552648ba134e7f758be58283fb524ab
-rw-r--r-- | hypv-intercept/Android.mk | 3 | ||||
-rw-r--r-- | libarbitrarybytes/Android.mk | 3 | ||||
-rw-r--r-- | libc2dcolorconvert/Android.mk | 3 | ||||
-rw-r--r-- | libplatformconfig/Android.mk | 3 | ||||
-rw-r--r-- | libstagefrighthw/Android.mk | 4 | ||||
-rw-r--r-- | mm-core/Android.mk | 9 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 3 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 6 | ||||
-rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 6 |
9 files changed, 39 insertions, 1 deletions
diff --git a/hypv-intercept/Android.mk b/hypv-intercept/Android.mk index 6d4e6bac..18044e82 100644 --- a/hypv-intercept/Android.mk +++ b/hypv-intercept/Android.mk @@ -13,6 +13,9 @@ LOCAL_CFLAGS := -D_ANDROID_ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libhypv_intercept +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 diff --git a/libarbitrarybytes/Android.mk b/libarbitrarybytes/Android.mk index 63817e84..de881459 100644 --- a/libarbitrarybytes/Android.mk +++ b/libarbitrarybytes/Android.mk @@ -13,6 +13,9 @@ libarbitrarybytes-inc += $(LOCAL_PATH)/../mm-video-v4l2/vidc/common/inc/ libarbitrarybytes-inc += $(LOCAL_PATH)/../mm-core/inc LOCAL_MODULE := libarbitrarybytes +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_PRELINK_MODULE := false LOCAL_VENDOR_MODULE := true diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index f6158fc0..234b75bf 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -21,6 +21,9 @@ LOCAL_SHARED_LIBRARIES := liblog libdl LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libc2dcolorconvert +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_VENDOR_MODULE := true diff --git a/libplatformconfig/Android.mk b/libplatformconfig/Android.mk index c346b0eb..0636b0c2 100644 --- a/libplatformconfig/Android.mk +++ b/libplatformconfig/Android.mk @@ -46,6 +46,9 @@ endif #################### LOCAL_MODULE := libplatformconfig +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 89f17d7b..ba70fb71 100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -51,8 +51,10 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ 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 3aee33c4..37a4b2e3 100644 --- a/mm-core/Android.mk +++ b/mm-core/Android.mk @@ -76,6 +76,9 @@ LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers 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)/../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils @@ -111,6 +114,9 @@ LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers 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)/../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libdl libcutils @@ -132,6 +138,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libomxcore_headers +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-MIT +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc LOCAL_VENDOR_MODULE := true diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index 0013278f..c5b0f541 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -30,6 +30,9 @@ libmm-vidc-inc += $(TOP)/hardware/libhardware/include libmm-vidc-inc += $(LIBION_HEADER_PATHS) LOCAL_MODULE := libOmxVidcCommon +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_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 323eba21..00344967 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -101,6 +101,9 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := libOmxVdec +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) -Wno-enum-compare -Werror @@ -144,6 +147,9 @@ ifneq "$(wildcard $(QCPATH) )" "" ifneq ($(call is-board-platform-in-list, $(TARGETS_THAT_DONT_NEED_SW_VDEC)),true) LOCAL_MODULE := libOmxSwVdec +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE 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 de46005b..42c3ca33 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -98,6 +98,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)/../../../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-venc-def) @@ -145,6 +148,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)/../../../LICENSE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true |