Snap for 7189849 from 566931355c6fe3ff51f9175f1f6c435c3a6a1fdb to sc-release
Change-Id: I758142083b03f115a92af982280230e07722afd3
diff --git a/src/freedreno/Android.common.mk b/src/freedreno/Android.common.mk
index 6859f36..098eb31 100644
--- a/src/freedreno/Android.common.mk
+++ b/src/freedreno/Android.common.mk
@@ -36,6 +36,9 @@
$(MESA_TOP)/src/gallium/auxiliary
LOCAL_MODULE := libfreedreno_common
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_STATIC_LIBRARIES := libmesa_git_sha1
diff --git a/src/freedreno/Android.ir2.mk b/src/freedreno/Android.ir2.mk
index 2d0c348..98fa2d6 100644
--- a/src/freedreno/Android.ir2.mk
+++ b/src/freedreno/Android.ir2.mk
@@ -32,6 +32,9 @@
$(ir2_SOURCES)
LOCAL_MODULE := libfreedreno_ir2
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/include \
diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk
index c444789..50ad0fa 100644
--- a/src/freedreno/Android.ir3.mk
+++ b/src/freedreno/Android.ir3.mk
@@ -32,6 +32,9 @@
$(ir3_SOURCES)
LOCAL_MODULE := libfreedreno_ir3
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 57efc0e..497a2a0 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -55,6 +55,9 @@
# We need libmesa_nir to get NIR's generated include directories.
LOCAL_MODULE := libmesa_gallium
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE
LOCAL_SHARED_LIBRARIES += libsync
LOCAL_STATIC_LIBRARIES += libmesa_nir
@@ -86,6 +89,9 @@
$(VL_SOURCES)
LOCAL_MODULE := libmesa_galliumvl
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../LICENSE
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk
index 70e2957..7fdc0c7 100644
--- a/src/gallium/drivers/iris/Android.mk
+++ b/src/gallium/drivers/iris/Android.mk
@@ -47,6 +47,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_iris_gen8
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -67,6 +70,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_iris_gen9
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -87,6 +93,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_iris_gen11
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -107,6 +116,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_iris_gen12
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES)
@@ -125,6 +137,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_pipe_iris
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../LICENSE
LOCAL_SRC_FILES := \
$(IRIS_C_SOURCES)
diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index 5ebb0c4..984a674 100644
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -35,6 +35,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen4
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
@@ -54,6 +57,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen5
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
@@ -73,6 +79,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen6
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
@@ -92,6 +101,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen7
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
@@ -111,6 +123,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen75
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
@@ -130,6 +145,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen8
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
@@ -149,6 +167,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen9
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
@@ -168,6 +189,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen11
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN11_FILES)
@@ -187,6 +211,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_gen12
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_GEN12_FILES)
@@ -206,6 +233,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_tiled_memcpy
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/include \
@@ -225,6 +255,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl_tiled_memcpy_sse41
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/include \
@@ -247,6 +280,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_isl
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := $(ISL_FILES)
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 35f4c33..18647f1 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -69,6 +69,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen7
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES)
@@ -90,6 +93,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen75
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES)
@@ -111,6 +117,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen8
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES)
@@ -132,6 +141,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen9
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES)
@@ -153,6 +165,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen11
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
@@ -174,6 +189,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen12
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN12_FILES)
@@ -196,6 +214,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_vulkan_common
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
@@ -253,6 +274,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := vulkan.$(TARGET_BOARD_PLATFORM)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-ISC SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 6482868..90b274f 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -57,6 +57,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen4
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -78,6 +81,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen45
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -99,6 +105,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen5
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -120,6 +129,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen6
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -141,6 +153,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen7
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -162,6 +177,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen75
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -183,6 +201,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen8
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -204,6 +225,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen9
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -225,6 +249,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_i965_gen11
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
@@ -246,6 +273,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := i965_dri
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE
LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk
index 60f704b..ac60544 100644
--- a/src/panfrost/Android.bifrost.mk
+++ b/src/panfrost/Android.bifrost.mk
@@ -22,6 +22,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_bifrost_disasm
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_SRC_FILES := \
$(bifrost_disasm_FILES)
@@ -60,6 +63,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_bifrost
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
prebuilt_intermediates := $(MESA_TOP)/prebuilt-intermediates
diff --git a/src/panfrost/Android.lib.mk b/src/panfrost/Android.lib.mk
index b39f712..20d0f83 100644
--- a/src/panfrost/Android.lib.mk
+++ b/src/panfrost/Android.lib.mk
@@ -21,6 +21,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_lib
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
diff --git a/src/panfrost/Android.util.mk b/src/panfrost/Android.util.mk
index 19731a7..91f1b9c 100644
--- a/src/panfrost/Android.util.mk
+++ b/src/panfrost/Android.util.mk
@@ -40,6 +40,9 @@
libmesa_nir \
LOCAL_MODULE := libpanfrost_util
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE
LOCAL_GENERATED_SOURCES := \
