| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/allocator.gni") | 5 import("//build/config/allocator.gni") |
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 7 import("//build/config/chromecast_build.gni") | 7 import("//build/config/chromecast_build.gni") |
| 8 import("//build/config/crypto.gni") | 8 import("//build/config/crypto.gni") |
| 9 import("//build/config/dcheck_always_on.gni") | 9 import("//build/config/dcheck_always_on.gni") |
| 10 import("//build/config/features.gni") | 10 import("//build/config/features.gni") |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 } | 129 } |
| 130 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) { | 130 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) { |
| 131 defines += [ "UNDEFINED_SANITIZER" ] | 131 defines += [ "UNDEFINED_SANITIZER" ] |
| 132 } | 132 } |
| 133 if (use_external_popup_menu) { | 133 if (use_external_popup_menu) { |
| 134 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] | 134 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] |
| 135 } | 135 } |
| 136 if (!enable_nacl) { | 136 if (!enable_nacl) { |
| 137 defines += [ "DISABLE_NACL" ] | 137 defines += [ "DISABLE_NACL" ] |
| 138 } | 138 } |
| 139 if (enable_task_manager) { | |
| 140 defines += [ "ENABLE_TASK_MANAGER=1" ] | |
| 141 } | |
| 142 if (enable_themes) { | 139 if (enable_themes) { |
| 143 defines += [ "ENABLE_THEMES=1" ] | 140 defines += [ "ENABLE_THEMES=1" ] |
| 144 } | 141 } |
| 145 if (enable_rlz) { | 142 if (enable_rlz) { |
| 146 defines += [ "ENABLE_RLZ" ] | 143 defines += [ "ENABLE_RLZ" ] |
| 147 } | 144 } |
| 148 if (enable_wayland_server) { | 145 if (enable_wayland_server) { |
| 149 defines += [ "ENABLE_WAYLAND_SERVER=1" ] | 146 defines += [ "ENABLE_WAYLAND_SERVER=1" ] |
| 150 } | 147 } |
| 151 if (proprietary_codecs) { | 148 if (proprietary_codecs) { |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 # | 402 # |
| 406 # TODO(sof): determine VS2015 status and retire the setting from all | 403 # TODO(sof): determine VS2015 status and retire the setting from all |
| 407 # precompiled configurations. | 404 # precompiled configurations. |
| 408 cflags_c = [ "/wd4206" ] | 405 cflags_c = [ "/wd4206" ] |
| 409 } else if (is_mac) { | 406 } else if (is_mac) { |
| 410 precompiled_header = "build/precompile.h" | 407 precompiled_header = "build/precompile.h" |
| 411 precompiled_source = "//build/precompile.h" | 408 precompiled_source = "//build/precompile.h" |
| 412 } | 409 } |
| 413 } | 410 } |
| 414 } | 411 } |
| OLD | NEW |