OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # IMPORTANT: | 5 # IMPORTANT: |
6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
8 { | 8 { |
9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1399 }], | 1399 }], |
1400 ['use_oem_wallpaper==1', { | 1400 ['use_oem_wallpaper==1', { |
1401 'grit_defines': ['-D', 'use_oem_wallpaper'], | 1401 'grit_defines': ['-D', 'use_oem_wallpaper'], |
1402 }], | 1402 }], |
1403 ['enable_app_list==1', { | 1403 ['enable_app_list==1', { |
1404 'grit_defines': ['-D', 'enable_app_list'], | 1404 'grit_defines': ['-D', 'enable_app_list'], |
1405 }], | 1405 }], |
1406 ['enable_settings_app==1', { | 1406 ['enable_settings_app==1', { |
1407 'grit_defines': ['-D', 'enable_settings_app'], | 1407 'grit_defines': ['-D', 'enable_settings_app'], |
1408 }], | 1408 }], |
| 1409 ['enable_google_now==1', { |
| 1410 'grit_defines': ['-D', 'enable_google_now'], |
| 1411 }], |
1409 ['clang_use_chrome_plugins==1 and OS!="win"', { | 1412 ['clang_use_chrome_plugins==1 and OS!="win"', { |
1410 'clang_chrome_plugins_flags': [ | 1413 'clang_chrome_plugins_flags': [ |
1411 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 1414 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
1412 ], | 1415 ], |
1413 }], | 1416 }], |
1414 | 1417 |
1415 ['enable_web_intents_tag==1', { | 1418 ['enable_web_intents_tag==1', { |
1416 'grit_defines': ['-D', 'enable_web_intents_tag'], | 1419 'grit_defines': ['-D', 'enable_web_intents_tag'], |
1417 }], | 1420 }], |
1418 | 1421 |
(...skipping 2567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3986 # settings in target dicts. SYMROOT is a special case, because many other | 3989 # settings in target dicts. SYMROOT is a special case, because many other |
3987 # Xcode variables depend on it, including variables such as | 3990 # Xcode variables depend on it, including variables such as |
3988 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3991 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3989 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3992 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3990 # files to appear (when present) in the UI as actual files and not red | 3993 # files to appear (when present) in the UI as actual files and not red |
3991 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3994 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3992 # and therefore SYMROOT, needs to be set at the project level. | 3995 # and therefore SYMROOT, needs to be set at the project level. |
3993 'SYMROOT': '<(DEPTH)/xcodebuild', | 3996 'SYMROOT': '<(DEPTH)/xcodebuild', |
3994 }, | 3997 }, |
3995 } | 3998 } |
OLD | NEW |