Commit 8c15c574 by Olli Etuaho Committed by Commit Bot

Revert "Gyp support for Ozone."

This broke the Linux standalone build. Error message seen when running "gclient runhooks": "gyp: name 'use_ozone' is not defined while evaluating condition 'OS=="linux" and use_ozone==0' in build/ANGLE.gyp while trying to load build/ANGLE.gyp" This reverts commit 35e65e92. Change-Id: Iee5f08195ee1c74ead99bb9d70d04928c9bae7af Reviewed-on: https://chromium-review.googlesource.com/338290Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent 35e65e92
...@@ -13,14 +13,6 @@ ...@@ -13,14 +13,6 @@
'angle_build_winrt%': '0', 'angle_build_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
# This works like the Ozone GBM platform in Chrome:
# - Generic Buffer Manager (gbm) to allocate buffers
# - EGL_EXT_image_dma_buf_import to render into those buffers via EGLImage
# - Direct Rendering Manager + Kernel Mode Setting to scan out from those buffers
# - EGL_PLATFORM_SURFACELESS because there are no native windows
'use_ozone%': 0,
'conditions': 'conditions':
[ [
['OS=="linux" and use_x11==1 and chromeos==0', { ['OS=="linux" and use_x11==1 and chromeos==0', {
...@@ -46,10 +38,6 @@ ...@@ -46,10 +38,6 @@
], ],
'conditions': 'conditions':
[ [
['use_ozone==1',
{
'defines': [ 'USE_OZONE' ],
}],
['component=="shared_library"', ['component=="shared_library"',
{ {
'defines': [ 'COMPONENT_BUILD' ], 'defines': [ 'COMPONENT_BUILD' ],
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
{ {
'conditions': 'conditions':
[ [
['OS=="linux" and use_ozone==0', ['OS=="linux"',
{ {
'use_x11': 1, 'use_x11': 1,
}, },
......
...@@ -38,10 +38,6 @@ ...@@ -38,10 +38,6 @@
{ {
'angle_enable_gl%': 1, 'angle_enable_gl%': 1,
}], }],
['use_ozone==1',
{
'angle_enable_gl%': 1,
}],
], ],
}, },
'includes': 'includes':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment