Commit 94a489cd authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

Build subproject only in goma client canary builder using cl.exe

chromium went to community support of cl.exe build and dropped cl.exe builder.
And goma's canary client builder using cl.exe quickly saw compile error. crbug.com/834213

However, some subprojects (e.g. v8) still have cl.exe builders.
So, goma team does not yet decide to drop cl.exe support for the subprojects.
Let us continue to use canary client builder with small targets.

Bug: b/78251210
Change-Id: Id86d2893f415894eae6797151b301de941511fd5
Reviewed-on: https://chromium-review.googlesource.com/1018681Reviewed-by: default avatarShinya Kawanaka <shinyak@chromium.org>
Reviewed-by: default avatarFumitoshi Ukai <ukai@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552083}
parent f46aa5c2
...@@ -8096,7 +8096,10 @@ ...@@ -8096,7 +8096,10 @@
}, },
"Win cl.exe Goma Canary LocalOutputCache": { "Win cl.exe Goma Canary LocalOutputCache": {
"additional_compile_targets": [ "additional_compile_targets": [
"all" "v8_all",
"webrtc",
"pdfium_all",
"angle"
], ],
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -8154,7 +8157,10 @@ ...@@ -8154,7 +8157,10 @@
}, },
"WinMSVC64 Goma Canary": { "WinMSVC64 Goma Canary": {
"additional_compile_targets": [ "additional_compile_targets": [
"all" "v8_all",
"webrtc",
"pdfium_all",
"angle"
], ],
"gtest_tests": [ "gtest_tests": [
{ {
......
...@@ -81,6 +81,10 @@ ...@@ -81,6 +81,10 @@
"label": "//android_webview/test:android_webview_unittests", "label": "//android_webview/test:android_webview_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"angle": {
"label": "//third_party/angle:libANGLE",
"type": "additional_compile_target",
},
"angle_deqp_egl_tests": { "angle_deqp_egl_tests": {
"label": "//third_party/angle/src/tests:angle_deqp_egl_tests", "label": "//third_party/angle/src/tests:angle_deqp_egl_tests",
"type": "raw", "type": "raw",
...@@ -929,6 +933,10 @@ ...@@ -929,6 +933,10 @@
"label": "//pdf:pdf_unittests", "label": "//pdf:pdf_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"pdfium_all": {
"label": "//third_party/pdfium:pdfium_all",
"type": "additional_compile_target",
},
"pdfium_test": { "pdfium_test": {
"label": "//third_party/pdfium/samples:pdfium_test", "label": "//third_party/pdfium/samples:pdfium_test",
"type": "additional_compile_target", "type": "additional_compile_target",
...@@ -1256,6 +1264,10 @@ ...@@ -1256,6 +1264,10 @@
"label": "//url:url_unittests", "label": "//url:url_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"v8_all": {
"label": "//v8:gn_all",
"type": "additional_compile_target",
},
"video_decode_accelerator_unittest": { "video_decode_accelerator_unittest": {
"label": "//media/gpu:video_decode_accelerator_unittest", "label": "//media/gpu:video_decode_accelerator_unittest",
"type": "raw", "type": "raw",
...@@ -1351,6 +1363,10 @@ ...@@ -1351,6 +1363,10 @@
"label": "//third_party/blink/renderer/controller:webkit_unit_tests", "label": "//third_party/blink/renderer/controller:webkit_unit_tests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"webrtc": {
"label": "//third_party/webrtc_overrides:webrtc",
"type": "additional_compile_target",
},
"webview_instrumentation_test_apk": { "webview_instrumentation_test_apk": {
"label": "//android_webview/test:webview_instrumentation_test_apk", "label": "//android_webview/test:webview_instrumentation_test_apk",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -1326,8 +1326,9 @@ ...@@ -1326,8 +1326,9 @@
}, },
}, },
'Win cl.exe Goma Canary LocalOutputCache': { 'Win cl.exe Goma Canary LocalOutputCache': {
# Build only chromium's subproject using cl.exe.
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'v8_all', 'webrtc', 'pdfium_all', 'angle',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'goma_gtests', 'gtest_tests': 'goma_gtests',
...@@ -1351,8 +1352,9 @@ ...@@ -1351,8 +1352,9 @@
}, },
}, },
'WinMSVC64 Goma Canary': { 'WinMSVC64 Goma Canary': {
# Build only chromium's subproject using cl.exe.
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'v8_all', 'webrtc', 'pdfium_all', 'angle',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'goma_gtests', 'gtest_tests': 'goma_gtests',
......
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