Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index 2347be6be86af5af240b6f0f2d72ca3e4f03ff55..9eae0dc94d3368d973508c263f2076bfb1f62e17 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -2490,18 +2490,23 @@ group("gn_all") { |
| deps = [ |
| ":d8", |
| - ":v8_hello_world", |
| - ":v8_parser_shell", |
| - ":v8_sample_process", |
| - ":v8_simple_json_fuzzer", |
| - ":v8_simple_parser_fuzzer", |
| - ":v8_simple_regexp_fuzzer", |
| - ":v8_simple_wasm_asmjs_fuzzer", |
| - ":v8_simple_wasm_fuzzer", |
| "test:gn_all", |
| "tools:gn_all", |
| ] |
| + if (!build_with_chromium) { |
| + deps += [ |
| + ":v8_hello_world", |
| + ":v8_parser_shell", |
| + ":v8_sample_process", |
| + ":v8_simple_json_fuzzer", |
| + ":v8_simple_parser_fuzzer", |
| + ":v8_simple_regexp_fuzzer", |
| + ":v8_simple_wasm_asmjs_fuzzer", |
| + ":v8_simple_wasm_fuzzer", |
| + ] |
| + } |
| + |
| if (want_v8_shell) { |
| deps += [ ":v8_shell" ] |
| } |
| @@ -2594,77 +2599,79 @@ v8_isolate_run("d8") { |
| isolate = "//src/d8.isolate" |
| } |
| -v8_executable("v8_hello_world") { |
| - sources = [ |
| - "samples/hello-world.cc", |
| - ] |
| +if (!build_with_chromium) { |
| + v8_executable("v8_hello_world") { |
| + sources = [ |
| + "samples/hello-world.cc", |
| + ] |
| - configs = [ |
| - # Note: don't use :internal_config here because this target will get |
| - # the :external_config applied to it by virtue of depending on :v8, and |
| - # you can't have both applied to the same target. |
| - ":internal_config_base", |
| - ] |
| + configs = [ |
| + # Note: don't use :internal_config here because this target will get |
| + # the :external_config applied to it by virtue of depending on :v8, and |
| + # you can't have both applied to the same target. |
| + ":internal_config_base", |
| + ] |
| - deps = [ |
| - ":v8", |
| - ":v8_libbase", |
| - ":v8_libplatform", |
| - "//build/config/sanitizers:deps", |
| - "//build/win:default_exe_manifest", |
| - ] |
| + deps = [ |
| + ":v8", |
| + ":v8_libbase", |
| + ":v8_libplatform", |
| + "//build/config/sanitizers:deps", |
| + "//build/win:default_exe_manifest", |
| + ] |
| - if (v8_enable_i18n_support) { |
| - deps += [ "//third_party/icu" ] |
| + if (v8_enable_i18n_support) { |
| + deps += [ "//third_party/icu" ] |
|
Michael Achenbach
2017/01/09 08:09:31
The following 50 lines are only indentation change
|
| + } |
| } |
| -} |
| -v8_executable("v8_sample_process") { |
| - sources = [ |
| - "samples/process.cc", |
| - ] |
| + v8_executable("v8_sample_process") { |
| + sources = [ |
| + "samples/process.cc", |
| + ] |
| - configs = [ |
| - # Note: don't use :internal_config here because this target will get |
| - # the :external_config applied to it by virtue of depending on :v8, and |
| - # you can't have both applied to the same target. |
| - ":internal_config_base", |
| - ] |
| + configs = [ |
| + # Note: don't use :internal_config here because this target will get |
| + # the :external_config applied to it by virtue of depending on :v8, and |
| + # you can't have both applied to the same target. |
| + ":internal_config_base", |
| + ] |
| - deps = [ |
| - ":v8", |
| - ":v8_libbase", |
| - ":v8_libplatform", |
| - "//build/config/sanitizers:deps", |
| - "//build/win:default_exe_manifest", |
| - ] |
| + deps = [ |
| + ":v8", |
| + ":v8_libbase", |
| + ":v8_libplatform", |
| + "//build/config/sanitizers:deps", |
| + "//build/win:default_exe_manifest", |
| + ] |
| - if (v8_enable_i18n_support) { |
| - deps += [ "//third_party/icu" ] |
| + if (v8_enable_i18n_support) { |
| + deps += [ "//third_party/icu" ] |
| + } |
| } |
| -} |
| -v8_executable("v8_parser_shell") { |
| - sources = [ |
| - "tools/parser-shell.cc", |
| - "tools/shell-utils.h", |
| - ] |
| + v8_executable("v8_parser_shell") { |
| + sources = [ |
| + "tools/parser-shell.cc", |
| + "tools/shell-utils.h", |
| + ] |
| - configs = [ |
| - ":external_config", |
| - ":internal_config_base", |
| - ] |
| + configs = [ |
| + ":external_config", |
| + ":internal_config_base", |
| + ] |
| - deps = [ |
| - ":v8", |
| - ":v8_libbase", |
| - ":v8_libplatform", |
| - "//build/config/sanitizers:deps", |
| - "//build/win:default_exe_manifest", |
| - ] |
| + deps = [ |
| + ":v8", |
| + ":v8_libbase", |
| + ":v8_libplatform", |
| + "//build/config/sanitizers:deps", |
| + "//build/win:default_exe_manifest", |
| + ] |
| - if (v8_enable_i18n_support) { |
| - deps += [ "//third_party/icu" ] |
| + if (v8_enable_i18n_support) { |
| + deps += [ "//third_party/icu" ] |
| + } |
| } |
| } |
| @@ -2696,20 +2703,22 @@ if (want_v8_shell) { |
| } |
| template("v8_fuzzer") { |
| - name = target_name |
| forward_variables_from(invoker, "*") |
| - v8_executable("v8_simple_" + name) { |
| - deps = [ |
| - ":" + name, |
| - "//build/config/sanitizers:deps", |
| - "//build/win:default_exe_manifest", |
| - ] |
| + if (!build_with_chromium) { |
| + name = target_name |
| + v8_executable("v8_simple_" + name) { |
| + deps = [ |
| + ":" + name, |
| + "//build/config/sanitizers:deps", |
| + "//build/win:default_exe_manifest", |
| + ] |
| - sources = [ |
| - "test/fuzzer/fuzzer.cc", |
| - ] |
| + sources = [ |
| + "test/fuzzer/fuzzer.cc", |
| + ] |
| - configs = [ ":external_config" ] |
| + configs = [ ":external_config" ] |
| + } |
| } |
| } |