diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 23:10:58 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 23:10:58 +0000 |
| commit | c76723a1f489484af50a177bd4020c1ed38e65ed (patch) | |
| tree | a6fe211e4f8fa42ac76818a4f9d2d27720897fba /build | |
| parent | 55ac7ea2120b48f88040289986bb46d530e6c296 (diff) | |
| download | chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.zip chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.tar.gz chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.tar.bz2 | |
linux: enable pepper plugin
This is CL 36399 that was reverted in 36969 because it caused an ICE on the official builders.
This adds a workaround for the ICE.
Review URL: http://codereview.chromium.org/546136
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 5 | ||||
| -rw-r--r-- | build/common.gypi | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index 03d7fee..8a0910b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -36,6 +36,7 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', '../third_party/zlib/zlib.gyp:*', + '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', '../webkit/webkit.gyp:*', 'util/build_util.gyp:*', @@ -55,7 +56,6 @@ ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', - '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }], ['OS=="linux"', { @@ -101,9 +101,6 @@ '../third_party/bspatch/bspatch.gyp:*', '../third_party/gles2_book/gles2_book.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', - # As of now, build machines do not have GL headers to compile this - # TODO(sehr,brettw, neb): Make this unconditional. - '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }, { 'dependencies': [ diff --git a/build/common.gypi b/build/common.gypi index 819515c..76af9cc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -187,6 +187,8 @@ # Enable TCMalloc. 'linux_use_tcmalloc%': 0, + 'linux_fpic%': 0, + # Set to select the Title Case versions of strings in GRD files. 'use_titlecase_in_grd_files%': 0, @@ -806,6 +808,11 @@ }], ], }], + ['linux_fpic==1', { + 'cflags': [ + '-fPIC', + ], + }], ['sysroot!=""', { 'target_conditions': [ ['_toolset=="target"', { |