diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 22:08:50 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 22:08:50 +0000 |
| commit | b656d73aaa4d75163e1226d4c4096560187f2488 (patch) | |
| tree | daff572a02d9a63f5c53026d099c4e966997a384 /build | |
| parent | a950ac48188421b7b19a205e10648cbfbda0a88f (diff) | |
| download | chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.zip chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.tar.gz chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.tar.bz2 | |
Revert 36399 - linux: enable pepper_test_plugin
This is breaking official x64 builds, notified team of break earlier in the
week, but haven't seen a fix. I'm reverting now.
Please fix before re-enabling.
Original message:
This includes a way to build it with full support on x64 (and arm ?), by specifying linux_fpic=1 in GYP_DEFINES and rerunning gyp.
Review URL: http://codereview.chromium.org/551041
TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/548133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36969 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, 4 insertions, 8 deletions
diff --git a/build/all.gyp b/build/all.gyp index 8a0910b..03d7fee 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -36,7 +36,6 @@ '../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:*', @@ -56,6 +55,7 @@ ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', + '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', ], }], ['OS=="linux"', { @@ -101,6 +101,9 @@ '../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 76af9cc..819515c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -187,8 +187,6 @@ # 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, @@ -808,11 +806,6 @@ }], ], }], - ['linux_fpic==1', { - 'cflags': [ - '-fPIC', - ], - }], ['sysroot!=""', { 'target_conditions': [ ['_toolset=="target"', { |