chromium/src
0
Fork 0
Code Activity

Replace mesa_headers with angle's headers

Browse Source 
This is the first step toward cleaning up gl header mess!

In this CL, we replace most of mesa_headers with
angle:includes except:

1) gpu/
2) ui/gl

TEST=bots, everything compiles

Bug: 353736708
Change-Id: I66163069efe1612b613dd7e47028b704f8f60abb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5722244
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1338033}
This commit is contained in:
Zhenyao Mo
2024-08-06 19:18:33 +00:00
committed by Chromium LUCI CQ
parent f4d466f11e
commit 5110fceec7
19 changed files with 24 additions and 24 deletions
BUILD.gn
cc
BUILD.gn
chrome/test
BUILD.gn
components
BUILD.gn
viz
BUILD.gn
content
shell
BUILD.gn
test
BUILD.gn
extensions
BUILD.gn
shell
BUILD.gn
media/gpu
BUILD.gn
ipc
service
BUILD.gn
ui
aura
BUILD.gn
base
BUILD.gn
compositor
BUILD.gn
events
BUILD.gn
message_center
BUILD.gn
ozone
common
BUILD.gn
gl
BUILD.gn
touch_selection
BUILD.gn

2
BUILD.gn

@ -1192,13 +1192,13 @@ if (use_blink && !is_cronet_build) {
"//services/shape_detection/public/mojom:mojom_js_data_deps",
"//skia/public/mojom:mojom_js_data_deps",
"//testing/buildbot/filters:blink_web_tests_filter",
"//third_party/angle:includes",
"//third_party/blink/public:blink_devtools_frontend_resources_files",
"//third_party/blink/public:blink_devtools_inspector_resources",
"//third_party/blink/public/mojom:mojom_platform_js_data_deps",
"//third_party/blink/renderer/core:gen_files_for_web_tests",
"//third_party/catapult/third_party/typ",
"//third_party/hyphenation-patterns:test_data",
"//third_party/mesa_headers",
"//tools/imagediff",
"//ui/base:goldctl",
]

4
cc/BUILD.gn

@ -688,7 +688,7 @@ cc_test_static_library("test_support") {
deps += [ "//gpu/vulkan/init" ]
}
if (!is_android) {
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
}
if (skia_use_dawn) {
deps += [
@ -946,7 +946,7 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (is_android && enable_chrome_android_internal) {

6
chrome/test/BUILD.gn

@ -2342,7 +2342,7 @@ if (!is_android) {
"//testing:test_scripts_shared",
"//testing/buildbot/filters:browser_tests_filters",
"//testing/buildbot/filters:linux_trusty_rel_browser_tests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//third_party/private_membership:private_membership_proto",
"//third_party/shell-encryption:serialization_proto",
"//third_party/widevine/cdm:widevine_test_license_server",
@ -11092,7 +11092,7 @@ if (!is_android && !is_chromeos_device) {
data_deps = [
"//chrome:browser_tests_pak",
"//testing/buildbot/filters:interactive_ui_tests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//ui/resources:ui_test_pak_data",
]
if (enable_ppapi) {
@ -12028,7 +12028,7 @@ if (!is_android) {
data_deps = [
"//testing:test_scripts_shared",
"//testing/buildbot/filters:sync_integration_tests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (is_linux || is_chromeos || is_win) {

4
components/BUILD.gn

@ -605,7 +605,7 @@ test("components_unittests") {
data_deps += [
":components_tests_pak",
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//ui/resources:ui_test_pak_data",
]
} # iOS / !iOS
@ -1042,7 +1042,7 @@ if (use_blink) {
data_deps = [
":components_tests_pak",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (is_mac) {

2
components/viz/BUILD.gn

@ -41,7 +41,7 @@ viz_test("viz_unittests") {
data_deps = [
"//testing/buildbot/filters:viz_unittests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (is_android) {

2
content/shell/BUILD.gn

@ -1056,7 +1056,7 @@ group("content_shell_crash_test") {
data_deps = [
":content_shell",
"//testing:test_scripts_shared",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
data = [
"//content/shell/tools/breakpad_integration_test.py",

2
content/test/BUILD.gn

@ -1826,9 +1826,9 @@ test("content_browsertests") {
"//storage/browser:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:includes",
"//third_party/blink/public:blink",
"//third_party/leveldatabase",
"//third_party/mesa_headers",
"//third_party/re2",
"//third_party/zlib",
"//third_party/zlib/google:compression_utils",

4
extensions/BUILD.gn

@ -275,7 +275,7 @@ test("extensions_unittests") {
data_deps = [
"//testing/buildbot/filters:extensions_unittests_filters",
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (is_chromeos) {
@ -301,7 +301,7 @@ test("extensions_browsertests") {
"//extensions/shell:browser_tests",
]
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
}
# TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have

2
extensions/shell/BUILD.gn

@ -339,7 +339,7 @@ test("app_shell_unittests") {
data_deps = [
# "//gin", # TODO(dpranke): Either gin or v8 data is needed ...
"//third_party/mesa_headers",
"//third_party/angle:includes",
]
if (use_aura) {

2
media/gpu/BUILD.gn

@ -85,7 +85,7 @@ component("gpu") {
"//base",
"//gpu",
"//media",
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//ui/gfx/geometry",
]
deps = [

2
media/gpu/ipc/service/BUILD.gn

@ -22,7 +22,7 @@ target(link_target_type, "service") {
"media_gpu_channel_manager.h",
]
include_dirs = [ "//third_party/mesa_headers" ]
include_dirs = [ "//third_party/angle:includes" ]
public_deps = [
"//base",

2
ui/aura/BUILD.gn

@ -350,7 +350,7 @@ test("aura_unittests") {
]
}
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
}
# This target is added as a dependency of browser interactive_ui_tests. It must

2
ui/base/BUILD.gn

@ -1292,7 +1292,7 @@ test("ui_base_unittests") {
"$root_out_dir/ui_test.pak", # TODO(brettw): remove this line.
]
data_deps += [
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//ui/resources:ui_test_pak", # TODO(brettw): this does nothing.
]
}

2
ui/compositor/BUILD.gn

@ -276,7 +276,7 @@ test("compositor_unittests") {
}
if (is_linux || is_chromeos) {
deps += [ "//third_party/mesa_headers" ]
deps += [ "//third_party/angle:includes" ]
}
if (is_chromeos) {

2
ui/events/BUILD.gn

@ -706,7 +706,7 @@ if (use_blink) {
sources += [ "android/motion_event_android_unittest.cc" ]
deps += [ "//ui/android:ui_full_java" ]
} else {
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
}
if (use_ozone) {

2
ui/message_center/BUILD.gn

@ -215,7 +215,7 @@ if (enable_message_center) {
]
data_deps = [
"//third_party/mesa_headers",
"//third_party/angle:includes",
"//ui/resources:ui_test_pak_data",
]

2
ui/ozone/common/BUILD.gn

@ -45,7 +45,7 @@ source_set("common") {
"//ui/gl:buildflags",
]
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
visibility = [
":*",

2
ui/ozone/gl/BUILD.gn

@ -16,5 +16,5 @@ test("ozone_gl_unittests") {
"//ui/ozone",
]
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
}

2
ui/touch_selection/BUILD.gn

@ -102,7 +102,7 @@ test("ui_touch_selection_unittests") {
"//ui/gfx:test_support",
]
data_deps = [ "//third_party/mesa_headers" ]
data_deps = [ "//third_party/angle:includes" ]
if (use_aura) {
deps += [ "//ui/compositor:compositor" ]