Google Git
Sign in
android/platform/hardware/qcom/camera/cf4c3922636edc17c2afbe3a807b97d4121c5823^1..cf4c3922636edc17c2afbe3a807b97d4121c5823/.
commit
cf4c3922636edc17c2afbe3a807b97d4121c5823
[log]
author
Bob Badour <bbadour@google.com>
Fri Feb 05 23:06:07 2021 +0000
committer
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri Feb 05 23:06:07 2021 +0000
tree
d6a447111d8af10ce68b8f82606e03262500270f
parent
0baadc3defa01231cdeb7b6599245321e2d25514 [diff]
parent
3c060997c4d4ae61787698792fe912b436f663d3 [diff]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/camera" am: 7ed1a29f66 am: 88346b64b4 am: 3c060997c4

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1576110

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8016f076b5c623e0dc1da0a190444a6a1b18e1d

diff --git a/msm8998/QCamera2/Android.mk b/msm8998/QCamera2/Android.mk
index dadec46..27502fb 100755
--- a/msm8998/QCamera2/Android.mk
+++ b/msm8998/QCamera2/Android.mk

@@ -158,6 +158,8 @@
 
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 

diff --git a/msm8998/QCamera2/HAL/test/Android.mk b/msm8998/QCamera2/HAL/test/Android.mk
index bd148b2..6480da3 100644
--- a/msm8998/QCamera2/HAL/test/Android.mk
+++ b/msm8998/QCamera2/HAL/test/Android.mk

@@ -46,6 +46,8 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_MODULE:= camera_test
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_MODULE_TAGS:= tests
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter

diff --git a/msm8998/QCamera2/HAL3/test/Android.mk b/msm8998/QCamera2/HAL3/test/Android.mk
index 7c688f4..164652d 100644
--- a/msm8998/QCamera2/HAL3/test/Android.mk
+++ b/msm8998/QCamera2/HAL3/test/Android.mk

@@ -45,6 +45,8 @@
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 
 LOCAL_MODULE:= hal3-test-app
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 

diff --git a/msm8998/QCamera2/stack/mm-camera-interface/Android.mk b/msm8998/QCamera2/stack/mm-camera-interface/Android.mk
index a7cfbd4..22ebf77 100644
--- a/msm8998/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/msm8998/QCamera2/stack/mm-camera-interface/Android.mk

@@ -60,6 +60,8 @@
 LOCAL_SRC_FILES := $(MM_CAM_FILES)
 
 LOCAL_MODULE           := libmmcamera_interface
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libutils
 LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_MODULE_TAGS := optional

diff --git a/msm8998/QCamera2/stack/mm-camera-test/Android.mk b/msm8998/QCamera2/stack/mm-camera-test/Android.mk
index a4a2b51..83864cf 100644
--- a/msm8998/QCamera2/stack/mm-camera-test/Android.mk
+++ b/msm8998/QCamera2/stack/mm-camera-test/Android.mk

@@ -93,6 +93,8 @@
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 
 LOCAL_MODULE:= mm-qcamera-app
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_EXECUTABLE)
@@ -188,6 +190,8 @@
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 
 LOCAL_MODULE:= libmm-qcamera
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
@@ -202,6 +206,8 @@
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 
 LOCAL_MODULE := cam_semaphore_tests
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_NATIVE_TEST)

diff --git a/msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk b/msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk
index ba93b7b..b599f0a 100644
--- a/msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk
+++ b/msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk

@@ -71,6 +71,8 @@
     src/mm_jpeg_mpo_composer.c
 
 LOCAL_MODULE           := libmmjpeg_interface
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRELINK_MODULE   := false
 LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libqomx_core libmmcamera_interface libutils
 ifeq ($(strip $(LIB2D_ROTATION)),true)

diff --git a/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index 10de9fe..6af8d49 100644
--- a/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk

@@ -45,6 +45,8 @@
 
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 LOCAL_MODULE           := mm-jpeg-interface-test
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRELINK_MODULE   := false
 LOCAL_SHARED_LIBRARIES := libcutils libdl liblog libmmjpeg_interface
 LOCAL_PROPRIETARY_MODULE := true
@@ -89,6 +91,8 @@
 
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 LOCAL_MODULE           := mm-jpegdec-interface-test
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRELINK_MODULE   := false
 LOCAL_SHARED_LIBRARIES := libcutils libdl liblog libmmjpeg_interface
 LOCAL_PROPRIETARY_MODULE := true

diff --git a/msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk b/msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk
index e963b69..f18cef0 100644
--- a/msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk
+++ b/msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk

@@ -29,6 +29,8 @@
     src/mm_lib2d.c
 
 LOCAL_MODULE           := libmmlib2d_interface
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRELINK_MODULE   := false
 LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface
 LOCAL_MODULE_TAGS := optional

diff --git a/msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk b/msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk
index 63cd5b7..54d6b02 100644
--- a/msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk
+++ b/msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk

@@ -29,6 +29,8 @@
 
 LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
 LOCAL_MODULE           := mm-lib2d-interface-test
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PRELINK_MODULE   := false
 LOCAL_SHARED_LIBRARIES := libcutils libdl libmmlib2d_interface
 

diff --git a/msm8998/mm-image-codec/qomx_core/Android.mk b/msm8998/mm-image-codec/qomx_core/Android.mk
index fd72b8a..d9cc79c 100644
--- a/msm8998/mm-image-codec/qomx_core/Android.mk
+++ b/msm8998/mm-image-codec/qomx_core/Android.mk

@@ -19,6 +19,8 @@
 LOCAL_SRC_FILES := qomx_core.c
 
 LOCAL_MODULE           := libqomx_core
+LOCAL_LICENSE_KINDS    := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_SHARED_LIBRARIES := libcutils libdl liblog libutils