From 6524f01c9fce43934403f3dc6e7c419feaecf8cf Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Tue, 22 Jun 2010 20:43:53 +0000 Subject: [PATCH] Enable gpu on all targets Review URL: http://codereview.chromium.org/2853011 git-svn-id: http://src.chromium.org/svn/trunk/src/build@50519 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/common.gypi b/common.gypi index 0867e42fe..afc6e295a 100644 --- a/common.gypi +++ b/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 '_'