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

Unified Diff: build/common.gypi

Issue 2853011: Enable gpu on all targets (Closed)
Patch Set: Created 10 years, 6 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
diff --git a/build/common.gypi b/build/common.gypi
index 0867e42fe61f45a3c9798d37d0e069efe8f871e7..afc6e295a37464d4f4d0d6a040cd4b6fca927cd9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -275,6 +275,10 @@
# Enable EGLImage support in OpenMAX
'enable_eglimage%': 0,
+ # Enable a variable used elsewhere throughout the GYP files to determine
+ # whether to compile in the sources for the GPU plugin / process.
+ 'enable_gpu%': 1,
+
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
@@ -359,15 +363,6 @@
'NACL_WIN64',
],
}],
- # Compute based on OS and target architecture whether the GPU
- # plugin / process is supported.
- [ 'OS=="win" or (OS=="linux" and target_arch!="arm") or OS=="mac"', {
- # Enable a variable used elsewhere throughout the GYP files to determine
- # whether to compile in the sources for the GPU plugin / process.
- 'enable_gpu%': 1,
- }, { # GPU plugin not supported
- 'enable_gpu%': 0,
- }],
],
# NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
« 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