diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:19:06 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:19:06 +0000 |
| commit | c4514c3c5719c148aacfafb85edabc6cd51ee501 (patch) | |
| tree | cfa40690d02cddfc2e1b8b7b6e0bf8763c33fe78 /build | |
| parent | 0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c (diff) | |
| download | chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.zip chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.tar.gz chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.tar.bz2 | |
linux: enable pepper_test_plugin
This includes a way to build it with full support on x64 (and arm ?), by specifying linux_fpic=1 in GYP_DEFINES and re-running gyp.
Review URL: http://codereview.chromium.org/551041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36399 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 fc19cd2..26220c1 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -35,6 +35,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:*', @@ -59,7 +60,6 @@ ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', - '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }], ['OS=="linux"', { @@ -105,9 +105,6 @@ '../third_party/cld/cld.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 8b79110..164095d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -193,6 +193,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, @@ -816,6 +818,11 @@ }], ], }], + ['linux_fpic==1', { + 'cflags': [ + '-fPIC', + ], + }], ['sysroot!=""', { 'target_conditions': [ ['_toolset=="target"', { |