commit 45ea20944a6c0c120d3bb416f005be092951f2c3
author Mike Schuchardt <mikes@lunarg.com> Fri Sep 06 17:36:07 2024
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 06 19:48:02 2024
tree b046f3bb1d3c9c6becc6bfb39461f26386230292
parent 20511d0bb72c820a997c832644d0ce5c4a97c895

Don't build api_dump for secondary abi on Android

32-bit builds of VK_LAYER_LUNARG_api_dump are extremely slow so skip
them when building for arm64.

Bug: b/42267058
Change-Id: I8c2d959d86a58537dafa518fb58267b38cda21f4
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5842279
Commit-Queue: Roman Lavrov <romanl@google.com>
Reviewed-by: Roman Lavrov <romanl@google.com>
Reviewed-by: Mark Łobodziński <mark@lunarg.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 60480ec..98af0ef 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1773,7 +1773,8 @@
       }
     }
 
-    if (angle_enable_vulkan_api_dump_layer) {
+    if (angle_enable_vulkan_api_dump_layer &&
+        current_toolchain == default_toolchain) {
       sources += [ "$root_out_dir/libVkLayer_lunarg_api_dump$shlib_extension" ]
     }
 
@@ -1791,7 +1792,8 @@
       }
     }
 
-    if (angle_enable_vulkan_api_dump_layer) {
+    if (angle_enable_vulkan_api_dump_layer &&
+        current_toolchain == default_toolchain) {
       deps += [ "$angle_lunarg_vulkantools_dir:VkLayer_lunarg_api_dump" ]
     }
 

android/angle_apk.gni

diff --git a/android/angle_apk.gni b/android/angle_apk.gni
index 18c1b49..51ab05c 100644
--- a/android/angle_apk.gni
+++ b/android/angle_apk.gni
@@ -66,11 +66,6 @@
                     "($android_secondary_abi_toolchain)" ]
             }
           }
-          if (angle_enable_vulkan_api_dump_layer) {
-            secondary_abi_shared_libraries +=
-                [ "$angle_lunarg_vulkantools_dir:VkLayer_lunarg_api_dump" +
-                  "($android_secondary_abi_toolchain)" ]
-          }
         } else {
           _secondary_out_dir = get_label_info(
                   ":compressed_symbols($android_secondary_abi_toolchain)",
@@ -84,9 +79,6 @@
               secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_layer}${shlib_extension}" ]
             }
           }
-          if (angle_enable_vulkan_api_dump_layer) {
-            secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/libVkLayer_lunarg_api_dump${shlib_extension}" ]
-          }
         }
       }
 

src/libANGLE/renderer/vulkan/BUILD.gn

diff --git a/src/libANGLE/renderer/vulkan/BUILD.gn b/src/libANGLE/renderer/vulkan/BUILD.gn
index 0105776..b201977 100644
--- a/src/libANGLE/renderer/vulkan/BUILD.gn
+++ b/src/libANGLE/renderer/vulkan/BUILD.gn
@@ -176,7 +176,8 @@
       data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ]
     }
 
-    if (angle_enable_vulkan_api_dump_layer) {
+    if (angle_enable_vulkan_api_dump_layer &&
+        current_toolchain == default_toolchain) {
       data_deps += [ "$angle_root/src/common/vulkan:lunarg_vulkantools" ]
     }