summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 20:43:53 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 20:43:53 +0000
commit6f51b27e286ab0e36f8ba8cdafd2649ad997df28 (patch)
treedd7a7cf340ac58a530c0aa6f2a750dd4f4ca40a9 /build
parent635b5cacd941af08cc616c4644fa4f7ee8bc3eec (diff)
downloadchromium_src-6f51b27e286ab0e36f8ba8cdafd2649ad997df28.zip
chromium_src-6f51b27e286ab0e36f8ba8cdafd2649ad997df28.tar.gz
chromium_src-6f51b27e286ab0e36f8ba8cdafd2649ad997df28.tar.bz2
Enable gpu on all targets
Review URL: http://codereview.chromium.org/2853011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi13
1 files changed, 4 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 0867e42..afc6e29 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 '_'