diff options
| author | Shahbaz Youssefi <syoussefi@chromium.org> | 2019-01-10 14:25:29 -0500 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-02-13 03:24:31 +0000 |
| commit | 55ea947c3bdd6c0ef68fc4b9ddbda26889f62622 (patch) | |
| tree | d2991e1bd66b03a9db336347811a06399eacbebd /android | |
| parent | d8506c7e247e03df0546a894d4f12b8451e23250 (diff) | |
| download | angle-55ea947c3bdd6c0ef68fc4b9ddbda26889f62622.tar.gz | |
Roll Vulkan repos
Bug: angleproject:3095
Change-Id: I6ae9d61304981223f9e2f1869ed32612aa38952c
Reviewed-on: https://chromium-review.googlesource.com/c/1405714
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Diffstat (limited to 'android')
| -rw-r--r-- | android/angle_apk.gni | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/android/angle_apk.gni b/android/angle_apk.gni index ee8b7c0afb..fe901f0f66 100644 --- a/android/angle_apk.gni +++ b/android/angle_apk.gni @@ -7,9 +7,9 @@ import("//third_party/angle/gni/angle.gni") vulkan_validation_layers = [ "VkLayer_core_validation", - "VkLayer_object_tracker", - "VkLayer_parameter_validation", - "VkLayer_threading", + "VkLayer_object_lifetimes", + "VkLayer_stateless_validation", + "VkLayer_thread_safety", "VkLayer_unique_objects", ] @@ -77,9 +77,10 @@ template("angle_apk") { } if (angle_enable_vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) { - secondary_abi_shared_libraries += - [ "${angle_root}/third_party/vulkan-validation-layers:${_layer}" + - "($android_secondary_abi_toolchain)" ] + secondary_abi_shared_libraries += [ + "${angle_root}/third_party/vulkan-validation-layers:${_layer}" + + "($android_secondary_abi_toolchain)", + ] } } } else { @@ -88,8 +89,7 @@ template("angle_apk") { "root_out_dir") secondary_abi_loadable_modules = [] foreach(_library, angle_libraries) { - secondary_abi_loadable_modules += - [ "${_secondary_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ] + secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ] } if (angle_enable_vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) { @@ -115,9 +115,7 @@ template("angle_apk") { } else { loadable_modules = [] foreach(_library, angle_libraries) { - loadable_modules += [ - "${root_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so", - ] + loadable_modules += [ "${root_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ] } if (angle_enable_vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) { |