Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index eb3c74726507c8701e92a29d290b61d05ed13317..1f402a087b3615ad4ac910faa088cee717e5f61c 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -29,6 +29,9 @@ |
| # Whether or not we are using the embedded messagepump. |
| 'use_messagepump_linux%': 0, |
| + |
| + # Use a raw surface abstraction. |
| + 'use_native_surface_linux%': 0, |
| }, |
| # Copy conditionally-set variables out one scope. |
| 'chromeos%': '<(chromeos)', |
| @@ -38,6 +41,9 @@ |
| # Whether or not we are using the /dev/input/event* message pump. |
| 'use_messagepump_linux%': '<(use_messagepump_linux)', |
| + # Use a raw Linux framebuffer. |
| + 'use_native_surface_linux%': '<(use_native_surface_linux)', |
| + |
| # Whether we are using Views Toolkit |
| 'toolkit_views%': 0, |
| @@ -98,6 +104,7 @@ |
| 'use_aura%': '<(use_aura)', |
| 'use_ash%': '<(use_ash)', |
| 'use_messagepump_linux%': '<(use_messagepump_linux)', |
| + 'use_native_surface_linux%': '<(use_native_surface_linux)', |
| 'use_openssl%': '<(use_openssl)', |
| 'enable_viewport%': '<(enable_viewport)', |
| 'enable_hidpi%': '<(enable_hidpi)', |
| @@ -182,6 +189,7 @@ |
| 'use_aura%': '<(use_aura)', |
| 'use_ash%': '<(use_ash)', |
| 'use_messagepump_linux%': '<(use_messagepump_linux)', |
| + 'use_native_surface_linux%': '<(use_native_surface_linux)', |
| 'use_openssl%': '<(use_openssl)', |
| 'enable_viewport%': '<(enable_viewport)', |
| 'enable_hidpi%': '<(enable_hidpi)', |
| @@ -719,6 +727,7 @@ |
| 'os_posix%': '<(os_posix)', |
| 'use_glib%': '<(use_glib)', |
| 'use_messagepump_linux%': '<(use_messagepump_linux)', |
| + 'use_native_surface_linux%': '<(use_native_surface_linux)', |
| 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 'use_x11%': '<(use_x11)', |
| 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| @@ -1837,6 +1846,9 @@ |
| ['use_messagepump_linux==1', { |
| 'defines': ['USE_MESSAGEPUMP_LINUX=1'], |
| }], |
| + ['use_native_surface_linux==1', { |
| + 'defines': ['USE_NATIVE_SURFACE_LINUX=1'], |
| + }], |
| ['use_default_render_theme==1', { |
| 'defines': ['USE_DEFAULT_RENDER_THEME=1'], |
| }], |
| @@ -2622,6 +2634,7 @@ |
| '<(werror)', # See note above about the werror variable. |
| '-pthread', |
| '-fno-exceptions', |
| + '-funwind-tables', # Emit unwind tables despite -fno-exceptions. |
|
jonathan.backer
2013/04/30 12:41:20
IDK what this is, but I don't see it on ToT. Merge
|
| '-fno-strict-aliasing', # See http://crbug.com/32204 |
| '-Wall', |
| # TODO(evan): turn this back on once all the builds work. |