Skip to content

A
angle
Commit 328f72ae by Jamie Madill Committed by Commit Bot
Options

Update VVL directories in Android build.

This should fix the duplicate target definition for the layers. Bug: angleproject:5390 Bug: angleproject:5468 Change-Id: Iaafe9e059fee823b2e4b9145ea38dc61b6d767db Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2593565Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 98b56e60
Showing with 5 additions and 8 deletions
BUILD.gn
...@@ -1183,9 +1183,7 @@ if (!is_component_build && is_android && symbol_level != 0) { ...@@ -1183,9 +1183,7 @@ if (!is_component_build && is_android && symbol_level != 0) {
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
deps += [ deps += [ "$angle_vulkan_validation_layers_dir:${_layer}" ]
"${angle_root}/third_party/vulkan-validation-layers/src:${_layer}",
]
} }
} }
......
android/angle_apk.gni
...@@ -61,10 +61,9 @@ if (enable_java_templates) { ...@@ -61,10 +61,9 @@ if (enable_java_templates) {
} }
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
secondary_abi_shared_libraries += [ secondary_abi_shared_libraries +=
"$angle_root/third_party/vulkan-validation-layers:${_layer}" + [ "$angle_vulkan_validation_layers_dir:${_layer}" +
"($android_secondary_abi_toolchain)", "($android_secondary_abi_toolchain)" ]
]
} }
} }
} else { } else {
...@@ -92,7 +91,7 @@ if (enable_java_templates) { ...@@ -92,7 +91,7 @@ if (enable_java_templates) {
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
shared_libraries += shared_libraries +=
[ "$angle_root/third_party/vulkan-validation-layers:${_layer}" ] [ "$angle_vulkan_validation_layers_dir:${_layer}" ]
} }
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment