зеркало из https://github.com/AvaloniaUI/angle.git
Roll Chromium manually from edbb6564c87b to a5a8696e5087 (458 revisions)
edbb6564c8..a5a8696e50
If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC timvp@google.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md Changed dependencies * build:6186e428fc..854fdb73c8
* testing:1c37217884..0fa2c0deee
* tools/clang:c5290b5af7..7e5979b1dd
* tools/mb:5e26fff7a7..cc0ee19df9
No update to Clang. Bug: angleproject:5038,angleproject:5124 Change-Id: Idcfbd8a5887c76b15d5a8aa424233eaef5de3a96 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2457127 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Родитель
98117b9def
Коммит
2d9d904ecb
10
DEPS
10
DEPS
|
@ -28,7 +28,7 @@ vars = {
|
|||
'checkout_angle_internal': False,
|
||||
|
||||
# Version of Chromium our Chromium-based DEPS are mirrored from.
|
||||
'chromium_revision': 'edbb6564c87bdb24603792c6f66275bde02d5eb3',
|
||||
'chromium_revision': 'a5a8696e508708bb1ed60b74d1200db40ab28886',
|
||||
# We never want to checkout chromium,
|
||||
# but need a dummy DEPS entry for the autoroller
|
||||
'dummy_checkout_chromium': False,
|
||||
|
@ -108,7 +108,7 @@ vars = {
|
|||
deps = {
|
||||
|
||||
'build': {
|
||||
'url': '{chromium_git}/chromium/src/build.git@6186e428fcd10faba1ce4c1728be654470e9ee95',
|
||||
'url': '{chromium_git}/chromium/src/build.git@854fdb73c846ea0265908cbc15dd5b3bb7ee85e6',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
|
@ -118,7 +118,7 @@ deps = {
|
|||
},
|
||||
|
||||
'testing': {
|
||||
'url': '{chromium_git}/chromium/src/testing@1c3721788447a2b52f0ac353057642cf28cf16d6',
|
||||
'url': '{chromium_git}/chromium/src/testing@0fa2c0deeebce254622f9a510dd19c53ac82ef4c',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
|
@ -279,7 +279,7 @@ deps = {
|
|||
},
|
||||
|
||||
'tools/clang': {
|
||||
'url': '{chromium_git}/chromium/src/tools/clang.git@c5290b5af7a91dd8aea12021107a62a21b2c9818',
|
||||
'url': '{chromium_git}/chromium/src/tools/clang.git@7e5979b1dd98e27570e58908e70a6e0c5978aa0e',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
|
@ -314,7 +314,7 @@ deps = {
|
|||
},
|
||||
|
||||
'tools/mb': {
|
||||
'url': '{chromium_git}/chromium/src/tools/mb@5e26fff7a79da636dffa9e3b3f6d9976905e7733',
|
||||
'url': '{chromium_git}/chromium/src/tools/mb@cc0ee19df9b57c9a57cee99d49b958bed6c99f7a',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ declare_args() {
|
|||
|
||||
if (angle_has_build) {
|
||||
import("//build/config/dcheck_always_on.gni")
|
||||
import("//build/config/ozone.gni")
|
||||
import("//build/config/sanitizers/sanitizers.gni")
|
||||
import("//build/config/ui.gni") # import the use_x11 variable
|
||||
import("//build_overrides/build.gni")
|
||||
|
@ -39,14 +40,6 @@ if (angle_has_build) {
|
|||
}
|
||||
}
|
||||
|
||||
if (build_with_chromium) {
|
||||
import("//build/config/ozone.gni")
|
||||
} else {
|
||||
declare_args() {
|
||||
ozone_platform_gbm = false
|
||||
}
|
||||
}
|
||||
|
||||
# Subdirectory to place data files (e.g. layer JSON files).
|
||||
angle_data_dir = "angledata"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче