| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 "DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1", | 105 "DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1", |
| 106 "WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1", | 106 "WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1", |
| 107 ] | 107 ] |
| 108 } | 108 } |
| 109 if (is_msan) { | 109 if (is_msan) { |
| 110 defines += [ "MEMORY_SANITIZER" ] | 110 defines += [ "MEMORY_SANITIZER" ] |
| 111 } | 111 } |
| 112 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) { | 112 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) { |
| 113 defines += [ "UNDEFINED_SANITIZER" ] | 113 defines += [ "UNDEFINED_SANITIZER" ] |
| 114 } | 114 } |
| 115 if (use_external_popup_menu) { | |
| 116 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] | |
| 117 } | |
| 118 if (!enable_nacl) { | 115 if (!enable_nacl) { |
| 119 defines += [ "DISABLE_NACL" ] | 116 defines += [ "DISABLE_NACL" ] |
| 120 } | 117 } |
| 121 if (safe_browsing_mode == 1) { | 118 if (safe_browsing_mode == 1) { |
| 122 defines += [ "FULL_SAFE_BROWSING" ] | 119 defines += [ "FULL_SAFE_BROWSING" ] |
| 123 defines += [ "SAFE_BROWSING_CSD" ] | 120 defines += [ "SAFE_BROWSING_CSD" ] |
| 124 defines += [ "SAFE_BROWSING_DB_LOCAL" ] | 121 defines += [ "SAFE_BROWSING_DB_LOCAL" ] |
| 125 } else if (safe_browsing_mode == 2) { | 122 } else if (safe_browsing_mode == 2) { |
| 126 defines += [ "SAFE_BROWSING_DB_REMOTE" ] | 123 defines += [ "SAFE_BROWSING_DB_REMOTE" ] |
| 127 } | 124 } |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 # then delete the precompile.c.obj file, then build again. | 365 # then delete the precompile.c.obj file, then build again. |
| 369 # | 366 # |
| 370 # TODO(sof): determine VS2015 status and retire the setting from all | 367 # TODO(sof): determine VS2015 status and retire the setting from all |
| 371 # precompiled configurations. | 368 # precompiled configurations. |
| 372 cflags_c = [ "/wd4206" ] | 369 cflags_c = [ "/wd4206" ] |
| 373 } else if (is_mac) { | 370 } else if (is_mac) { |
| 374 precompiled_source = "//build/precompile.h" | 371 precompiled_source = "//build/precompile.h" |
| 375 } | 372 } |
| 376 } | 373 } |
| 377 } | 374 } |
| OLD | NEW |