| 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 1378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1389 }], | 1389 }], |
| 1390 ['use_oem_wallpaper==1', { | 1390 ['use_oem_wallpaper==1', { |
| 1391 'grit_defines': ['-D', 'use_oem_wallpaper'], | 1391 'grit_defines': ['-D', 'use_oem_wallpaper'], |
| 1392 }], | 1392 }], |
| 1393 ['enable_app_list==1', { | 1393 ['enable_app_list==1', { |
| 1394 'grit_defines': ['-D', 'enable_app_list'], | 1394 'grit_defines': ['-D', 'enable_app_list'], |
| 1395 }], | 1395 }], |
| 1396 ['enable_settings_app==1', { | 1396 ['enable_settings_app==1', { |
| 1397 'grit_defines': ['-D', 'enable_settings_app'], | 1397 'grit_defines': ['-D', 'enable_settings_app'], |
| 1398 }], | 1398 }], |
| 1399 ['enable_google_now==1', { |
| 1400 'grit_defines': ['-D', 'enable_google_now'], |
| 1401 }], |
| 1399 ['clang_use_chrome_plugins==1 and OS!="win"', { | 1402 ['clang_use_chrome_plugins==1 and OS!="win"', { |
| 1400 'clang_chrome_plugins_flags': [ | 1403 'clang_chrome_plugins_flags': [ |
| 1401 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 1404 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
| 1402 ], | 1405 ], |
| 1403 }], | 1406 }], |
| 1404 | 1407 |
| 1405 ['enable_web_intents_tag==1', { | 1408 ['enable_web_intents_tag==1', { |
| 1406 'grit_defines': ['-D', 'enable_web_intents_tag'], | 1409 'grit_defines': ['-D', 'enable_web_intents_tag'], |
| 1407 }], | 1410 }], |
| 1408 | 1411 |
| (...skipping 2558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3967 # settings in target dicts. SYMROOT is a special case, because many other | 3970 # settings in target dicts. SYMROOT is a special case, because many other |
| 3968 # Xcode variables depend on it, including variables such as | 3971 # Xcode variables depend on it, including variables such as |
| 3969 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3972 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3970 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3973 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3971 # files to appear (when present) in the UI as actual files and not red | 3974 # files to appear (when present) in the UI as actual files and not red |
| 3972 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3975 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3973 # and therefore SYMROOT, needs to be set at the project level. | 3976 # and therefore SYMROOT, needs to be set at the project level. |
| 3974 'SYMROOT': '<(DEPTH)/xcodebuild', | 3977 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3975 }, | 3978 }, |
| 3976 } | 3979 } |
| OLD | NEW |