diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:05:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:05:44 +0000 |
commit | 1ab20278417537b27dffd143b19214d657c2aadc (patch) | |
tree | 7527b1dee6cc5e632614eb7c567bf049fdfc053e | |
parent | 712e117152a51486d4e864d9b42000438932717f (diff) | |
parent | fc91dcd8f27644983b04af5d789688d2a0245759 (diff) | |
download | display-android13-mainline-permission-release.tar.gz |
Snap for 8564071 from fc91dcd8f27644983b04af5d789688d2a0245759 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android13-mainline-permission-release
Change-Id: I7940405be664979d61776221403de8b6091b40d3
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | common.mk | 4 | ||||
-rw-r--r-- | gpu_tonemapper/Android.mk | 5 | ||||
-rw-r--r-- | gpu_tonemapper/glengine.cpp | 57 | ||||
-rw-r--r-- | gralloc/Android.mk | 10 | ||||
-rw-r--r-- | hdmi_cec/Android.mk | 2 | ||||
-rw-r--r-- | libdebug/Android.mk | 2 | ||||
-rw-r--r-- | libdisplayconfig/Android.mk | 2 | ||||
-rw-r--r-- | libdrmutils/Android.mk | 2 | ||||
-rw-r--r-- | libhistogram/Android.mk | 6 | ||||
-rw-r--r-- | liblight/Android.mk | 5 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 2 | ||||
-rw-r--r-- | libqdutils/Android.bp | 9 | ||||
-rw-r--r-- | libqservice/Android.bp | 11 | ||||
-rw-r--r-- | sdm/libs/core/Android.mk | 2 | ||||
-rw-r--r-- | sdm/libs/hwc2/Android.mk | 2 | ||||
-rw-r--r-- | sdm/libs/utils/Android.mk | 2 |
19 files changed, 119 insertions, 40 deletions
@@ -1,3 +1,32 @@ +package { + default_applicable_licenses: ["hardware_qcom_sdm845_display_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "hardware_qcom_sdm845_display_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "legacy_not_a_contribution", + ], + // large-scale-change unable to identify any license_text files +} + cc_defaults { name: "display_defaults", cflags: [ @@ -12,7 +41,7 @@ cc_defaults { "libutils", ], header_libs: ["display_headers"], - clang: true, + } cc_library_headers { @@ -10,7 +10,7 @@ endif display-hals += gralloc ifneq ($(BUILD_WITHOUT_VENDOR),true) -ifeq ($(call is-vendor-board-platform,QCOM),true) +ifneq (,$(call is-vendor-board-qcom)) include $(call all-named-subdir-makefiles,$(display-hals)) else ifneq ($(filter msm% apq%,$(TARGET_BOARD_PLATFORM)),) diff --git a/METADATA b/METADATA new file mode 100644 index 00000000..d97975ca --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} @@ -41,7 +41,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true) common_flags += -D__ARM_HAVE_NEON endif -ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true) +ifneq (,$(call is-board-platform-in-list2, $(MASTER_SIDE_CP_TARGET_LIST))) common_flags += -DMASTER_SIDE_CP endif @@ -63,7 +63,7 @@ ifeq ($(LLVM_SA), true) common_flags += --compile-and-analyze --analyzer-perf --analyzer-Werror endif -common_includes := system/core/base/include +common_includes := system/libbase/include CHECK_VERSION_LE = $(shell if [ $(1) -le $(2) ] ; then echo true ; else echo false ; fi) PLATFORM_SDK_NOUGAT = 25 ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 3c3d8d38..845cc5f3 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -9,6 +9,8 @@ include $(BUILD_COPY_HEADERS) include $(CLEAR_VARS) LOCAL_MODULE := libgpu_tonemapper +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution +LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/ @@ -17,7 +19,8 @@ LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ - -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\" + -Wno-unused-parameter -Wno-unreachable-code-loop-increment \ + -DLOG_TAG=\"GPU_TONEMAPPER\" LOCAL_SRC_FILES := TonemapFactory.cpp \ glengine.cpp \ diff --git a/gpu_tonemapper/glengine.cpp b/gpu_tonemapper/glengine.cpp index 35e1932c..bf3b58a5 100644 --- a/gpu_tonemapper/glengine.cpp +++ b/gpu_tonemapper/glengine.cpp @@ -315,36 +315,30 @@ void checkGlError(const char *file, int line) //----------------------------------------------------------------------------- { for (GLint error = glGetError(); error; error = glGetError()) { - char *pError; + const char *pError = "<unknown error>"; switch (error) { case GL_NO_ERROR: - pError = (char *)"GL_NO_ERROR"; + pError = "GL_NO_ERROR"; break; case GL_INVALID_ENUM: - pError = (char *)"GL_INVALID_ENUM"; + pError = "GL_INVALID_ENUM"; break; case GL_INVALID_VALUE: - pError = (char *)"GL_INVALID_VALUE"; + pError = "GL_INVALID_VALUE"; break; case GL_INVALID_OPERATION: - pError = (char *)"GL_INVALID_OPERATION"; + pError = "GL_INVALID_OPERATION"; break; case GL_OUT_OF_MEMORY: - pError = (char *)"GL_OUT_OF_MEMORY"; + pError = "GL_OUT_OF_MEMORY"; break; case GL_INVALID_FRAMEBUFFER_OPERATION: - pError = (char *)"GL_INVALID_FRAMEBUFFER_OPERATION"; + pError = "GL_INVALID_FRAMEBUFFER_OPERATION"; break; - - default: - ALOGE("glError (0x%x) %s:%d\n", error, file, line); - return; } ALOGE("glError (%s) %s:%d\n", pError, file, line); - return; } - return; } //----------------------------------------------------------------------------- @@ -357,59 +351,54 @@ void checkEglError(const char *file, int line) break; } - char *pError; + const char *pError = "<unknown error>"; switch (error) { case EGL_SUCCESS: - pError = (char *)"EGL_SUCCESS"; + pError = "EGL_SUCCESS"; break; case EGL_NOT_INITIALIZED: - pError = (char *)"EGL_NOT_INITIALIZED"; + pError = "EGL_NOT_INITIALIZED"; break; case EGL_BAD_ACCESS: - pError = (char *)"EGL_BAD_ACCESS"; + pError = "EGL_BAD_ACCESS"; break; case EGL_BAD_ALLOC: - pError = (char *)"EGL_BAD_ALLOC"; + pError = "EGL_BAD_ALLOC"; break; case EGL_BAD_ATTRIBUTE: - pError = (char *)"EGL_BAD_ATTRIBUTE"; + pError = "EGL_BAD_ATTRIBUTE"; break; case EGL_BAD_CONTEXT: - pError = (char *)"EGL_BAD_CONTEXT"; + pError = "EGL_BAD_CONTEXT"; break; case EGL_BAD_CONFIG: - pError = (char *)"EGL_BAD_CONFIG"; + pError = "EGL_BAD_CONFIG"; break; case EGL_BAD_CURRENT_SURFACE: - pError = (char *)"EGL_BAD_CURRENT_SURFACE"; + pError = "EGL_BAD_CURRENT_SURFACE"; break; case EGL_BAD_DISPLAY: - pError = (char *)"EGL_BAD_DISPLAY"; + pError = "EGL_BAD_DISPLAY"; break; case EGL_BAD_SURFACE: - pError = (char *)"EGL_BAD_SURFACE"; + pError = "EGL_BAD_SURFACE"; break; case EGL_BAD_MATCH: - pError = (char *)"EGL_BAD_MATCH"; + pError = "EGL_BAD_MATCH"; break; case EGL_BAD_PARAMETER: - pError = (char *)"EGL_BAD_PARAMETER"; + pError = "EGL_BAD_PARAMETER"; break; case EGL_BAD_NATIVE_PIXMAP: - pError = (char *)"EGL_BAD_NATIVE_PIXMAP"; + pError = "EGL_BAD_NATIVE_PIXMAP"; break; case EGL_BAD_NATIVE_WINDOW: - pError = (char *)"EGL_BAD_NATIVE_WINDOW"; + pError = "EGL_BAD_NATIVE_WINDOW"; break; case EGL_CONTEXT_LOST: - pError = (char *)"EGL_CONTEXT_LOST"; + pError = "EGL_CONTEXT_LOST"; break; - default: - ALOGE("eglError (0x%x) %s:%d\n", error, file, line); - return; } ALOGE("eglError (%s) %s:%d\n", pError, file, line); - return; } - return; } diff --git a/gralloc/Android.mk b/gralloc/Android.mk index 343af4e4..c1a50423 100644 --- a/gralloc/Android.mk +++ b/gralloc/Android.mk @@ -4,6 +4,8 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := gralloc.$(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_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional @@ -25,6 +27,8 @@ include $(BUILD_SHARED_LIBRARY) #libgrallocutils include $(CLEAR_VARS) LOCAL_MODULE := libgrallocutils +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 LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -40,6 +44,8 @@ include $(BUILD_SHARED_LIBRARY) #libgralloccore include $(CLEAR_VARS) LOCAL_MODULE := libgralloccore +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 LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) @@ -64,6 +70,8 @@ qti_allocator_version := $(shell \ #mapper include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.graphics.mapper@2.0-impl-qti-display +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_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional @@ -84,6 +92,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := vendor.qti.hardware.display.allocator@1.0-service +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_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional diff --git a/hdmi_cec/Android.mk b/hdmi_cec/Android.mk index a333654c..c73d20df 100644 --- a/hdmi_cec/Android.mk +++ b/hdmi_cec/Android.mk @@ -3,6 +3,8 @@ include $(LOCAL_PATH)/../common.mk include $(CLEAR_VARS) LOCAL_MODULE := hdmi_cec.$(TARGET_BOARD_PLATFORM) +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional diff --git a/libdebug/Android.mk b/libdebug/Android.mk index bbe8555b..a27b0415 100644 --- a/libdebug/Android.mk +++ b/libdebug/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libdisplaydebug +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdl diff --git a/libdisplayconfig/Android.mk b/libdisplayconfig/Android.mk index f719c9da..4286e041 100644 --- a/libdisplayconfig/Android.mk +++ b/libdisplayconfig/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libdisplayconfig +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SYSTEM_EXT_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk index 172233f9..75a24e0d 100644 --- a/libdrmutils/Android.mk +++ b/libdrmutils/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libdrmutils +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := external/libdrm \ diff --git a/libhistogram/Android.mk b/libhistogram/Android.mk index 144ee9ab..634ead83 100644 --- a/libhistogram/Android.mk +++ b/libhistogram/Android.mk @@ -17,6 +17,8 @@ include $(CLEAR_VARS) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_MODULE := libhistogram +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := histogram_collector.cpp ringbuffer.cpp LOCAL_SHARED_LIBRARIES := libdrm liblog libcutils libutils LOCAL_CFLAGS := -DLOG_TAG=\"SDM-histogram\" -Wall -std=c++14 -Werror -fno-operator-names @@ -31,6 +33,8 @@ include $(CLEAR_VARS) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_MODULE := color_sampling_tool +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := color_sampling_tool.cpp LOCAL_STATIC_LIBRARIES := libhistogram @@ -46,6 +50,8 @@ include $(CLEAR_VARS) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_MODULE := color_sampling_test +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := ringbuffer_test.cpp LOCAL_STATIC_LIBRARIES := libhistogram libgtest libgmock diff --git a/liblight/Android.mk b/liblight/Android.mk index d485c7e3..a701e89f 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -27,7 +27,10 @@ ifeq ($(LLVM_SA), true) endif LOCAL_CFLAGS += -Wno-error LOCAL_CLANG := true -LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE := lights.qcom +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution +LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk index 7a356044..bc2e32f9 100644 --- a/libmemtrack/Android.mk +++ b/libmemtrack/Android.mk @@ -27,4 +27,6 @@ LOCAL_SHARED_LIBRARIES := liblog LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_SRC_FILES := memtrack_msm.c kgsl.c LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM) +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice include $(BUILD_SHARED_LIBRARY) diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp index 0c1b96a1..d088d787 100644 --- a/libqdutils/Android.bp +++ b/libqdutils/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_qcom_sdm845_display_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["hardware_qcom_sdm845_display_license"], +} + cc_library_shared { name: "libqdutils", vendor: true, diff --git a/libqservice/Android.bp b/libqservice/Android.bp index fe69d393..6f11a1aa 100644 --- a/libqservice/Android.bp +++ b/libqservice/Android.bp @@ -1,3 +1,14 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "hardware_qcom_sdm845_display_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // legacy_not_a_contribution + default_applicable_licenses: ["hardware_qcom_sdm845_display_license"], +} + cc_library_shared { name: "libqservice", vendor: true, diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk index d4aa9331..9d7b6dcf 100644 --- a/sdm/libs/core/Android.mk +++ b/sdm/libs/core/Android.mk @@ -3,6 +3,8 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmcore +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk index 57d9b375..1d602f61 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -5,6 +5,8 @@ include $(LOCAL_PATH)/../../../common.mk ifeq ($(use_hwc2),true) LOCAL_MODULE := hwcomposer.$(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_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk index a9d705cd..6dddae6c 100644 --- a/sdm/libs/utils/Android.mk +++ b/sdm/libs/utils/Android.mk @@ -3,6 +3,8 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmutils +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) |