aura: Make GTK a dependency again for chrome/aura etc. to make things buildable.
BUG=97131 TEST=none Review URL: http://codereview.chromium.org/7978016 git-svn-id: http://src.chromium.org/svn/trunk/src/build@102078 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
a16a345354
Коммит
f3bba76ca4
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
// A flag derived from the above flags, used to cover GTK code in
|
// A flag derived from the above flags, used to cover GTK code in
|
||||||
// both TOOLKIT_GTK and TOOLKIT_VIEWS.
|
// both TOOLKIT_GTK and TOOLKIT_VIEWS.
|
||||||
#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN) && !defined(USE_AURA))
|
#if defined(TOOLKIT_GTK) || (defined(TOOLKIT_VIEWS) && !defined(OS_WIN))
|
||||||
#define TOOLKIT_USES_GTK 1
|
#define TOOLKIT_USES_GTK 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -237,7 +237,7 @@
|
||||||
'use_x11%': 1,
|
'use_x11%': 1,
|
||||||
}],
|
}],
|
||||||
['use_aura==1 and OS!="win"', {
|
['use_aura==1 and OS!="win"', {
|
||||||
'toolkit_uses_gtk%': 0,
|
'toolkit_uses_gtk%': 1,
|
||||||
}],
|
}],
|
||||||
|
|
||||||
# A flag to enable or disable our compile-time dependency
|
# A flag to enable or disable our compile-time dependency
|
||||||
|
|
Загрузка…
Ссылка в новой задаче