| 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 29 matching lines...) Expand all Loading... |
| 40 "ENABLE_GOOGLE_NOW=1", | 40 "ENABLE_GOOGLE_NOW=1", |
| 41 "ENABLE_CAPTIVE_PORTAL_DETECTION=1", | 41 "ENABLE_CAPTIVE_PORTAL_DETECTION=1", |
| 42 "ENABLE_APP_LIST=1", | 42 "ENABLE_APP_LIST=1", |
| 43 "ENABLE_SETTINGS_APP=1", | 43 "ENABLE_SETTINGS_APP=1", |
| 44 "ENABLE_MANAGED_USERS=1", | 44 "ENABLE_MANAGED_USERS=1", |
| 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 | |
| 51 # Enable a new Gamepad interface. | |
| 52 # TODO(cdumez): This is temporary and should go away once the chromium | |
| 53 # and blink interfaces are in sync, http://crbug.com/344556. | |
| 54 "ENABLE_NEW_GAMEPAD_API=1", | |
| 55 ] | 50 ] |
| 56 | 51 |
| 57 if (cld_version > 0) { | 52 if (cld_version > 0) { |
| 58 defines += [ "CLD_VERSION=$cld_version" ] | 53 defines += [ "CLD_VERSION=$cld_version" ] |
| 59 } | 54 } |
| 60 if (enable_mdns) { | 55 if (enable_mdns) { |
| 61 defines += [ "ENABLE_MDNS=1" ] | 56 defines += [ "ENABLE_MDNS=1" ] |
| 62 } | 57 } |
| 63 if (enable_pepper_cdms) { | 58 if (enable_pepper_cdms) { |
| 64 # TODO(brettw) should probably be "=1" | 59 # TODO(brettw) should probably be "=1" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 "CoreText.framework", | 222 "CoreText.framework", |
| 228 "Foundation.framework", | 223 "Foundation.framework", |
| 229 "UIKit.framework", | 224 "UIKit.framework", |
| 230 ] | 225 ] |
| 231 } else if (is_linux) { | 226 } else if (is_linux) { |
| 232 libs = [ | 227 libs = [ |
| 233 "dl", | 228 "dl", |
| 234 ] | 229 ] |
| 235 } | 230 } |
| 236 } | 231 } |
| OLD | NEW |