commit faef3a770af4d5c044c48ce5df5944e90123a55e
author Stephen White <senorblanco@chromium.org> Mon Nov 27 22:17:52 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 27 22:17:52 2023 +0000
tree 70154f791a515bc5d5639ad848abe31c72483a36
parent c4f069a078a8f8d613fc9db9882fb37a71ee564c

Only build ANGLE for dawn_end2end_tests.

Adding data_deps on ANGLE breaks Chrome on Android, so only
add the dependency for dawn_end2end_tests for now.

Bug: dawn:1284 chromium:1453445

Bug: chromium:1453445
Change-Id: Icb465f23dfb3951fa9512014b0a62d95fc6e5af7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/149803
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/dawn/native/BUILD.gn

diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 4d8de67..890dad5 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -39,9 +39,6 @@
   import("//build_overrides/vulkan_validation_layers.gni")
 }
 
-# ANGLE is an optional dependency; only use it if the path has been set.
-use_angle = dawn_use_angle && defined(dawn_angle_dir)
-
 # Swiftshader is an optional dependency, only use it if the path has been set.
 use_swiftshader = dawn_use_swiftshader && dawn_swiftshader_dir != ""
 if (use_swiftshader) {
@@ -872,13 +869,6 @@
       defines += [ "DAWN_ENABLE_SPIRV_VALIDATION" ]
     }
   }
-
-  if (use_angle) {
-    data_deps += [
-      "${dawn_angle_dir}:libEGL",
-      "${dawn_angle_dir}:libGLESv2",
-    ]
-  }
 }
 
 # The static and shared libraries for dawn_native. Most of the files are

src/dawn/tests/BUILD.gn

diff --git a/src/dawn/tests/BUILD.gn b/src/dawn/tests/BUILD.gn
index 7e16c8e..de77a43 100644
--- a/src/dawn/tests/BUILD.gn
+++ b/src/dawn/tests/BUILD.gn
@@ -772,6 +772,13 @@
     ":white_box_tests_sources",
   ]
 
+  if (dawn_use_angle && defined(dawn_angle_dir)) {
+    data_deps = [
+      "${dawn_angle_dir}:libEGL",
+      "${dawn_angle_dir}:libGLESv2",
+    ]
+  }
+
   sources = []
   libs = []