ozone: Add initial build support for xkbcommon
This adds a use_xkbcommon variable that allows usage of libxkbcommon in the build. Turn this on for linux ozone builds (except embedded builds). BUG=430194 TEST=build Review URL: https://codereview.chromium.org/751623003 Cr-Original-Commit-Position: refs/heads/master@{#308204} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 304529e882cd79826c1b8f222a0e855da2ba8a59
This commit is contained in:
Родитель
6208c78054
Коммит
6f3ed786a3
|
@ -706,6 +706,13 @@
|
|||
'use_dbus%': 0,
|
||||
}],
|
||||
|
||||
# Libxkbcommon usage.
|
||||
['use_ozone==1 and embedded==0', {
|
||||
'use_xkbcommon%': 1,
|
||||
}, {
|
||||
'use_xkbcommon%': 0,
|
||||
}],
|
||||
|
||||
# We always use skia text rendering in Aura on Windows, since GDI
|
||||
# doesn't agree with our BackingStore.
|
||||
# TODO(beng): remove once skia text rendering is on by default.
|
||||
|
@ -1087,6 +1094,7 @@
|
|||
'use_cairo%': '<(use_cairo)',
|
||||
'use_ozone%': '<(use_ozone)',
|
||||
'use_ozone_evdev%': '<(use_ozone_evdev)',
|
||||
'use_xkbcommon%': '<(use_xkbcommon)',
|
||||
'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
|
||||
'desktop_linux%': '<(desktop_linux)',
|
||||
'use_x11%': '<(use_x11)',
|
||||
|
|
|
@ -465,6 +465,27 @@
|
|||
},
|
||||
],
|
||||
}],
|
||||
['use_xkbcommon==1', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'xkbcommon',
|
||||
'type': 'none',
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(<(pkg-config) --cflags xkbcommon)'
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other xkbcommon)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(<(pkg-config) --libs-only-l xkbcommon)',
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}],
|
||||
['ozone_platform_gbm==1', {
|
||||
'targets': [
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче