summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/ash_unittests.isolate2
-rw-r--r--cc/cc_unittests.isolate2
-rw-r--r--chrome/angle_deqp_tests.isolate2
-rw-r--r--chrome/chrome.isolate2
-rw-r--r--chrome/gl_tests.isolate2
-rw-r--r--chrome/gles2_conform_test.isolate2
-rw-r--r--chrome/sync_integration_tests.isolate2
-rw-r--r--chrome/unit_tests.isolate2
-rw-r--r--components/components_browsertests.isolate2
-rw-r--r--components/components_unittests.isolate2
-rw-r--r--content/content_browsertests.isolate2
-rw-r--r--content/content_unittests.isolate2
-rw-r--r--extensions/extensions_browsertests.isolate2
-rw-r--r--gpu/gpu_unittests.isolate2
-rw-r--r--ui/gl/gl.isolate21
15 files changed, 35 insertions, 14 deletions
diff --git a/ash/ash_unittests.isolate b/ash/ash_unittests.isolate
index 4866e71..30039bb 100644
--- a/ash/ash_unittests.isolate
+++ b/ash/ash_unittests.isolate
@@ -62,6 +62,6 @@
],
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate
index 6a16fcd..6576a50 100644
--- a/cc/cc_unittests.isolate
+++ b/cc/cc_unittests.isolate
@@ -81,6 +81,6 @@
],
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/chrome/angle_deqp_tests.isolate b/chrome/angle_deqp_tests.isolate
index fe544a5..1dd7a20 100644
--- a/chrome/angle_deqp_tests.isolate
+++ b/chrome/angle_deqp_tests.isolate
@@ -5,7 +5,7 @@
{
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
'conditions': [
['OS=="win"', {
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 43bc605..90b3c48 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -127,7 +127,7 @@
],
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
'../gin/v8.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate
index 643e926..a880f9a 100644
--- a/chrome/gl_tests.isolate
+++ b/chrome/gl_tests.isolate
@@ -4,7 +4,7 @@
{
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
'conditions': [
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
diff --git a/chrome/gles2_conform_test.isolate b/chrome/gles2_conform_test.isolate
index e4a46a4..3dd74a1 100644
--- a/chrome/gles2_conform_test.isolate
+++ b/chrome/gles2_conform_test.isolate
@@ -4,7 +4,7 @@
{
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
'conditions': [
# TODO(kbr): add Android when these tests are run on those bots.
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 0b22cf6..6c7e6fc 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -111,6 +111,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 8c17738..be312f5 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -160,6 +160,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate
index 0419dcd..a96725e 100644
--- a/components/components_browsertests.isolate
+++ b/components/components_browsertests.isolate
@@ -89,6 +89,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate
index ccdaf16..dda3761 100644
--- a/components/components_unittests.isolate
+++ b/components/components_unittests.isolate
@@ -91,6 +91,6 @@
],
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 9f0fc4f..ca92600 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -140,6 +140,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 61eca66..cc6622c 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -105,6 +105,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate
index 301e919..a060728 100644
--- a/extensions/extensions_browsertests.isolate
+++ b/extensions/extensions_browsertests.isolate
@@ -80,6 +80,6 @@
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/gpu/gpu_unittests.isolate b/gpu/gpu_unittests.isolate
index 999c870..ad0fd2c 100644
--- a/gpu/gpu_unittests.isolate
+++ b/gpu/gpu_unittests.isolate
@@ -59,6 +59,6 @@
],
'includes': [
'../base/base.isolate',
- '../third_party/angle/angle.isolate',
+ '../ui/gl/gl.isolate',
],
}
diff --git a/ui/gl/gl.isolate b/ui/gl/gl.isolate
new file mode 100644
index 0000000..1ca7ef5
--- /dev/null
+++ b/ui/gl/gl.isolate
@@ -0,0 +1,21 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This isolate expresses the dependency on the default behavior of
+# Chromium's OpenGL binding layer. Many targets (in particular test
+# targets) that use graphics rely on this layer either implicitly or
+# explicitly, but not all of them need a direct dependency on ANGLE,
+# especially as ANGLE is being brought up on more platforms. This
+# isolate allows these targets to continue to use Chromium's default
+# graphics code path, while others can depend directly on ANGLE on
+# non-Windows platforms.
+{
+ # If includes were supported in conditions, we'd prefer to
+ # conditionally include angle.isolate here only on Windows, rather
+ # than introducing another isolate for ANGLE on multiple
+ # platforms. https://github.com/luci/luci-py/issues/230
+ 'includes': [
+ '../../third_party/angle/angle.isolate',
+ ],
+}
generated by cgit v1.1 at 2025-01-08 03:09:22 +0000