Chromium Code Reviews| Index: third_party/WebKit/Source/BUILD.gn |
| diff --git a/third_party/WebKit/Source/BUILD.gn b/third_party/WebKit/Source/BUILD.gn |
| index 6ecca3e43d562ea0ea3ab442cef3b634150e2a46..0397c66b5e850d631312508cfd40d9b8c3c0c531 100644 |
| --- a/third_party/WebKit/Source/BUILD.gn |
| +++ b/third_party/WebKit/Source/BUILD.gn |
| @@ -54,32 +54,40 @@ config("config") { |
| } |
| if (is_clang && blink_gc_plugin && clang_use_chrome_plugins) { |
| + _blink_gc_plugin_dll_extension = "so" |
| if (is_mac || is_ios) { |
| + _blink_gc_plugin_dll_extension = "dylib" |
| + } |
| + cflags += [ |
| + "-Xclang", |
| + "-load", |
| + "-Xclang", |
| + rebase_path( |
| + "${blink_gc_plugin_lib_path}/libBlinkGCPlugin.${_blink_gc_plugin_dll_extension}", |
|
Nico
2016/06/21 20:53:13
this should only be done if is_mac || is_ios || is
sof
2016/06/22 10:58:04
Thanks, fixed (the regression.)
|
| + root_build_dir), |
| + "-Xclang", |
| + "-add-plugin", |
| + "-Xclang", |
| + "blink-gc-plugin", |
| + ] |
| + |
| + # Add arguments for enabled GC plugin options: |
| + if (blink_gc_plugin_option_do_dump_graph) { |
| cflags += [ |
| "-Xclang", |
| - "-load", |
| + "-plugin-arg-blink-gc-plugin", |
| "-Xclang", |
| - rebase_path( |
| - "//third_party/llvm-build/Release+Asserts/lib/libBlinkGCPlugin.dylib", |
| - root_build_dir), |
| + "dump-graph", |
| ] |
| - } else if (is_linux) { |
| + } |
| + if (blink_gc_plugin_option_warn_unneeded_finalizer) { |
| cflags += [ |
| "-Xclang", |
| - "-load", |
| + "-plugin-arg-blink-gc-plugin", |
| "-Xclang", |
| - rebase_path( |
| - "//third_party/llvm-build/Release+Asserts/lib/libBlinkGCPlugin.so", |
| - root_build_dir), |
| + "warn-unneeded-finalizer", |
| ] |
| } |
| - |
| - cflags += [ |
| - "-Xclang", |
| - "-add-plugin", |
| - "-Xclang", |
| - "blink-gc-plugin", |
| - ] |
| } |
| } |