| 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 (use_external_popup_menu) { |  130   if (use_external_popup_menu) { | 
|  131     defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] |  131     defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] | 
|  132   } |  132   } | 
|  133   if (!enable_nacl) { |  133   if (!enable_nacl) { | 
|  134     defines += [ "DISABLE_NACL" ] |  134     defines += [ "DISABLE_NACL" ] | 
|  135   } |  135   } | 
|  136   if (enable_wayland_server) { |  136   if (enable_wayland_server) { | 
|  137     defines += [ "ENABLE_WAYLAND_SERVER=1" ] |  137     defines += [ "ENABLE_WAYLAND_SERVER=1" ] | 
|  138   } |  138   } | 
|  139   if (proprietary_codecs) { |  | 
|  140     defines += [ "USE_PROPRIETARY_CODECS" ] |  | 
|  141   } |  | 
|  142   if (safe_browsing_mode == 1) { |  139   if (safe_browsing_mode == 1) { | 
|  143     defines += [ "FULL_SAFE_BROWSING" ] |  140     defines += [ "FULL_SAFE_BROWSING" ] | 
|  144     defines += [ "SAFE_BROWSING_CSD" ] |  141     defines += [ "SAFE_BROWSING_CSD" ] | 
|  145     defines += [ "SAFE_BROWSING_DB_LOCAL" ] |  142     defines += [ "SAFE_BROWSING_DB_LOCAL" ] | 
|  146   } else if (safe_browsing_mode == 2) { |  143   } else if (safe_browsing_mode == 2) { | 
|  147     defines += [ "SAFE_BROWSING_DB_REMOTE" ] |  144     defines += [ "SAFE_BROWSING_DB_REMOTE" ] | 
|  148   } |  145   } | 
|  149   if (is_official_build) { |  146   if (is_official_build) { | 
|  150     defines += [ "OFFICIAL_BUILD" ] |  147     defines += [ "OFFICIAL_BUILD" ] | 
|  151   } |  148   } | 
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  393       # |  390       # | 
|  394       # TODO(sof): determine VS2015 status and retire the setting from all |  391       # TODO(sof): determine VS2015 status and retire the setting from all | 
|  395       # precompiled configurations. |  392       # precompiled configurations. | 
|  396       cflags_c = [ "/wd4206" ] |  393       cflags_c = [ "/wd4206" ] | 
|  397     } else if (is_mac) { |  394     } else if (is_mac) { | 
|  398       precompiled_header = "build/precompile.h" |  395       precompiled_header = "build/precompile.h" | 
|  399       precompiled_source = "//build/precompile.h" |  396       precompiled_source = "//build/precompile.h" | 
|  400     } |  397     } | 
|  401   } |  398   } | 
|  402 } |  399 } | 
| OLD | NEW |