Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: build/common.gypi

Issue 1747019: remove the logic to compute enable_gles since it's broken;... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 45879)
+++ build/common.gypi (working copy)
@@ -248,6 +248,12 @@
# Enable new NPDevice API.
'enable_new_npdevice_api%': 0,
+ # Enable OpenGL ES.
+ 'enable_gles%': 0,
+
+ # Enable EGLImage support in OpenMAX
+ 'enable_eglimage%': 0,
+
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
@@ -337,15 +343,6 @@
}, { # GPU plugin not supported
'enable_gpu%': 0,
}],
- # Compute based on OS, target architecture and device whether GLES
- # is supported
- [ 'OS=="linux" and target_arch=="arm" and chromeos==1', {
- # Enable a variable used elsewhere throughout the GYP files to determine
- # whether to compile in the sources for the GLES support.
- 'enable_gles%': 1,
- }, { # GLES not supported
- 'enable_gles%': 0,
- }],
],
# NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
@@ -435,6 +432,11 @@
'ENABLE_GLES=1',
],
}],
+ ['enable_eglimage==1', {
+ 'defines': [
+ 'ENABLE_EGLIMAGE=1',
+ ],
+ }],
['coverage!=0', {
'conditions': [
['OS=="mac"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698