diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-05 21:56:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 21:56:36 +0000 |
| commit | fdb59555aa300b8b7bfcc330583f1d4da9df9e80 (patch) | |
| tree | 3cd48d215b895dc3147ab91ba69dfedd762bca38 | |
| parent | 339036c0c03e5505f3b1a6b91388b2ff28c27c3a (diff) | |
| parent | b8c3c1531a2860875abe1b7f5a443a1925217837 (diff) | |
| download | vulkan-validation-layers-fdb59555aa300b8b7bfcc330583f1d4da9df9e80.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to external/vulkan-validation-layers am: c6e561e3cc am: b8c3c1531a
Original change: https://android-review.googlesource.com/c/platform/external/vulkan-validation-layers/+/1576065
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7c80c1dd01f2c15673f9cd805eeefc28d713196
| -rw-r--r-- | build-android/jni/Android.mk | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 6f93c7ff8..b95d2bd15 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -22,6 +22,9 @@ VULKAN_INCLUDE := $(LOCAL_PATH)/$(SRC_DIR)/include include $(CLEAR_VARS) LOCAL_MODULE := layer_utils +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp @@ -35,6 +38,9 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_khronos_validation +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/drawdispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/descriptor_sets.cpp @@ -64,6 +70,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_core_validation +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/drawdispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/descriptor_sets.cpp @@ -87,6 +96,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_parameter_validation +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/parameter_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/layer_chassis_dispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/chassis.cpp @@ -104,6 +116,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_object_tracker +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/object_tracker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/layer_chassis_dispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/chassis.cpp @@ -121,6 +136,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_threading +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/thread_safety.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/layer_chassis_dispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/chassis.cpp @@ -137,6 +155,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_unique_objects +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/layer_chassis_dispatch.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/generated/chassis.cpp LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \ @@ -152,6 +173,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayerValidationTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ $(SRC_DIR)/tests/vklayertests_pipeline_shader.cpp \ $(SRC_DIR)/tests/vklayertests_buffer_image_memory_sampler.cpp \ @@ -182,6 +206,9 @@ include $(BUILD_EXECUTABLE) # Note: The following module is similar in name to the executable, but differs so that loader won't enumerate the resulting .so include $(CLEAR_VARS) LOCAL_MODULE := VulkanLayerValidationTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE.txt $(LOCAL_PATH)/../../NOTICE LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ $(SRC_DIR)/tests/vklayertests_pipeline_shader.cpp \ $(SRC_DIR)/tests/vklayertests_buffer_image_memory_sampler.cpp \ |