Temporarily disable dawn_use_angle on Android.
It's adding dependencies on ANGLE's libEGL.so and libGLESv2.so which Chromium's linker on Android doesn't allow. Temporarily disable it (and, implicitly, WebGPU/Compat) in order to get Dawn's unit and end2end tests running on the CI bots while this is investigated. Bug: dawn:286 Bug: dawn:1545 Change-Id: Idd35c4e2b95454dca3faf9c522c028e0ff129e55 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/103300 Reviewed-by: Brandon Jones <bajones@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Kenneth Russell <kbr@google.com>
This commit is contained in:
parent
f92830b623
commit
417acaf650
|
@ -32,7 +32,12 @@ if (build_with_chromium) {
|
||||||
dawn_is_winuwp = is_win && target_os == "winuwp"
|
dawn_is_winuwp = is_win && target_os == "winuwp"
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
dawn_use_angle = true
|
# TODO(dawn:1545): Re-enable dawn_use_angle on Android. In non-component
|
||||||
|
# builds, this is adding a dependency on ANGLE's libEGL.so and
|
||||||
|
# libGLESv2.so, apparently without regard for the use_static_angle=true
|
||||||
|
# GN variable. Chromium's linker on Android disallows production of more
|
||||||
|
# than one shared object per target (?).
|
||||||
|
dawn_use_angle = !is_android
|
||||||
|
|
||||||
# Enables SwiftShader as the fallback adapter. Requires dawn_swiftshader_dir
|
# Enables SwiftShader as the fallback adapter. Requires dawn_swiftshader_dir
|
||||||
# to be set to take effect.
|
# to be set to take effect.
|
||||||
|
|
Loading…
Reference in New Issue