Chromium Code Reviews| 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/crypto.gni") | 6 import("//build/config/crypto.gni") | 
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") | 
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") | 
| 9 | 9 | 
| 10 declare_args() { | 10 declare_args() { | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 "ENABLE_SERVICE_DISCOVERY=1", | 45 "ENABLE_SERVICE_DISCOVERY=1", | 
| 46 "USE_MOJO=1", | 46 "USE_MOJO=1", | 
| 47 "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. | 47 "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. | 
| 48 # Temporary suppression until Blink code can be removed. | 48 # Temporary suppression until Blink code can be removed. | 
| 49 "BLINK_SCALE_FILTERS_AT_RECORD_TIME", | 49 "BLINK_SCALE_FILTERS_AT_RECORD_TIME", | 
| 50 ] | 50 ] | 
| 51 | 51 | 
| 52 if (cld_version > 0) { | 52 if (cld_version > 0) { | 
| 53 defines += [ "CLD_VERSION=$cld_version" ] | 53 defines += [ "CLD_VERSION=$cld_version" ] | 
| 54 } | 54 } | 
| 55 if (deterministic_build) { | |
| 
 
brettw
2014/06/11 20:26:53
You need to declare this as an "Arg" like disable_
 
Sébastien Marchand
2014/06/11 20:30:33
Is it ok to define it in BUILDCONFIG.gn ?
 
 | |
| 56 defines += [ "DETERMINISTIC_BUILD=1" ] | |
| 
 
M-A Ruel
2014/06/11 20:01:01
Why do you set it to 1 here and no in common.gypi.
 
Sébastien Marchand
2014/06/11 20:25:41
Because I was scared by GN so I haven't realized t
 
 | |
| 57 } | |
| 55 if (enable_mdns) { | 58 if (enable_mdns) { | 
| 56 defines += [ "ENABLE_MDNS=1" ] | 59 defines += [ "ENABLE_MDNS=1" ] | 
| 57 } | 60 } | 
| 58 if (enable_pepper_cdms) { | 61 if (enable_pepper_cdms) { | 
| 59 # TODO(brettw) should probably be "=1" | 62 # TODO(brettw) should probably be "=1" | 
| 60 defines += [ "ENABLE_PEPPER_CDMS" ] | 63 defines += [ "ENABLE_PEPPER_CDMS" ] | 
| 61 } | 64 } | 
| 62 if (enable_plugins) { | 65 if (enable_plugins) { | 
| 63 defines += [ "ENABLE_PLUGINS=1" ] | 66 defines += [ "ENABLE_PLUGINS=1" ] | 
| 64 } | 67 } | 
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 "CoreText.framework", | 228 "CoreText.framework", | 
| 226 "Foundation.framework", | 229 "Foundation.framework", | 
| 227 "UIKit.framework", | 230 "UIKit.framework", | 
| 228 ] | 231 ] | 
| 229 } else if (is_linux) { | 232 } else if (is_linux) { | 
| 230 libs = [ | 233 libs = [ | 
| 231 "dl", | 234 "dl", | 
| 232 ] | 235 ] | 
| 233 } | 236 } | 
| 234 } | 237 } | 
| OLD | NEW |