зеркало из https://github.com/AvaloniaUI/angle.git
Rearrange Android lib deps
Vulkan backend was missing dependency on NativeWindow. Bug: angleproject:2314 Change-Id: I66675af6f885b57bdb0524a0626dfec0256a21d3 Reviewed-on: https://chromium-review.googlesource.com/c/1354100 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
This commit is contained in:
Родитель
c4e0a1e511
Коммит
b29fccfe2a
15
BUILD.gn
15
BUILD.gn
|
@ -418,6 +418,7 @@ if (angle_use_commit_id) {
|
|||
config("libANGLE_config") {
|
||||
cflags = []
|
||||
defines = []
|
||||
libs = []
|
||||
if (angle_enable_d3d9) {
|
||||
defines += [ "ANGLE_ENABLE_D3D9" ]
|
||||
}
|
||||
|
@ -444,6 +445,14 @@ config("libANGLE_config") {
|
|||
if (is_win) {
|
||||
cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics are not enabled.
|
||||
}
|
||||
|
||||
if (is_android && (angle_enable_gl || angle_enable_vulkan)) {
|
||||
if (ndk_supports_nativewindow) {
|
||||
libs += [ "nativewindow" ]
|
||||
} else {
|
||||
libs += [ "android" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (angle_enable_vulkan) {
|
||||
|
@ -549,12 +558,6 @@ static_library("libANGLE") {
|
|||
sources += libangle_gl_egl_sources
|
||||
sources += libangle_gl_egl_dl_sources
|
||||
sources += libangle_gl_egl_android_sources
|
||||
if (ndk_supports_nativewindow) {
|
||||
libs += [ "nativewindow" ]
|
||||
} else {
|
||||
libs += [ "android" ]
|
||||
}
|
||||
libs += [ "log" ]
|
||||
}
|
||||
if (ozone_platform_gbm) {
|
||||
configs += [ ":libdrm" ]
|
||||
|
|
Загрузка…
Ссылка в новой задаче