diff options
| author | olonho@google.com <olonho@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 16:19:26 +0000 |
|---|---|---|
| committer | olonho@google.com <olonho@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 16:19:26 +0000 |
| commit | 836285f2a86b11920cd8e391a6888cfba9e4cfce (patch) | |
| tree | d1f92f37bcf8f759af24364e989da18b8e352b8c /build | |
| parent | 33661e48840aaf44b3efe090b3e947ef83f67a0a (diff) | |
| download | chromium_src-836285f2a86b11920cd8e391a6888cfba9e4cfce.zip chromium_src-836285f2a86b11920cd8e391a6888cfba9e4cfce.tar.gz chromium_src-836285f2a86b11920cd8e391a6888cfba9e4cfce.tar.bz2 | |
Remove hack in .gyp file disabling NaCl in ARM CrOs build. We still have it disabled in ebuild.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2687
TEST=
Review URL: https://chromiumcodereview.appspot.com/9911013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index f9f9f40..b93e82a 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -732,14 +732,10 @@ # The desired version of Windows SDK can be set in ~/.gyp/include.gypi. 'msbuild_toolset%': '', + # Native Client is enabled by default. + 'disable_nacl%': 0, + 'conditions': [ - # Used to disable Native Client at compile time, for platforms where it - # isn't supported (ARM) - ['target_arch=="arm" and chromeos == 1', { - 'disable_nacl%': 1, - }, { - 'disable_nacl%': 0, - }], ['os_posix==1 and OS!="mac" and OS!="android"', { # This will set gcc_version to XY if you are running gcc X.Y.*. # This is used to tweak build flags for gcc 4.4. |