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