diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:08:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:08:19 +0000 |
commit | be5f540389737b158f2fbabf636359592a244088 (patch) | |
tree | ac7537a7a192f568bee60fd864d11a4f5901b618 | |
parent | 94daee85eee1226db428846d29f7c8d9a0f8bc2e (diff) | |
parent | 5c74a7ae39cbbc4b198774a6f1dec872c65ec981 (diff) | |
download | camera-be5f540389737b158f2fbabf636359592a244088.tar.gz |
Snap for 8564071 from 5c74a7ae39cbbc4b198774a6f1dec872c65ec981 to mainline-wifi-releaseaml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040android14-mainline-wifi-releaseandroid13-mainline-wifi-release
Change-Id: I7ace696702d5ac6f969952e46195923c119b7914
-rw-r--r-- | METADATA | 3 | ||||
-rwxr-xr-x | msm8998/QCamera2/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/QCamera2/HAL/test/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/QCamera2/HAL3/test/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-camera-interface/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-camera-test/Android.mk | 6 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/common.mk | 2 | ||||
-rw-r--r-- | msm8998/mm-image-codec/qomx_core/Android.mk | 2 |
12 files changed, 31 insertions, 2 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/msm8998/QCamera2/Android.mk b/msm8998/QCamera2/Android.mk index dadec46..95053f4 100755 --- a/msm8998/QCamera2/Android.mk +++ b/msm8998/QCamera2/Android.mk @@ -149,7 +149,7 @@ LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcam LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder libbinder_ndk LOCAL_SHARED_LIBRARIES += libbase libcutils libdl libhdrplusclient LOCAL_SHARED_LIBRARIES += libhidlbase libutils android.hardware.power@1.2 -LOCAL_SHARED_LIBRARIES += android.hardware.power-ndk_platform +LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk LOCAL_SHARED_LIBRARIES += libtinyxml2 ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal @@ -158,6 +158,8 @@ LOCAL_HEADER_LIBRARIES := libhardware_headers media_plugin_headers 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_C_INCLUDES += \ 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_SHARED_LIBRARIES:= libutils libcamera_client liblog libcamera_metadata lib 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_CFLAGS += -Wall -Wextra -Werror 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_MODULE_TAGS := optional 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_MODULE_TAGS := optional 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_C_INCLUDES += $(LOCAL_PATH)/../common 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 @@ LOCAL_SRC_FILES := \ 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_SRC_FILES := mm_jpeg_test.c 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_SRC_FILES := mm_jpegdec_test.c 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 @@ LOCAL_SRC_FILES := \ 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_SRC_FILES := mm_lib2d_test.c 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/common.mk b/msm8998/common.mk index a872679..5c9ce70 100644 --- a/msm8998/common.mk +++ b/msm8998/common.mk @@ -1,7 +1,7 @@ common_deps := kernel_includes := -ifeq ($(call is-vendor-board-platform,QCOM),true) +ifneq (,$(call is-vendor-board-qcom)) ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include 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_INC_FILES := qomx_core.h \ 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 |