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: http://src.chromium.org/svn/trunk/src/build@36399 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
f2e82cd621
Коммит
4e4c96317d
5
all.gyp
5
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': [
|
||||
|
|
|
@ -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"', {
|
||||
|
|
Загрузка…
Ссылка в новой задаче