Chromium Code Reviews| 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 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1452 'win_release_InlineFunctionExpansion': '1', | 1452 'win_release_InlineFunctionExpansion': '1', |
| 1453 'win_release_OmitFramePointers': '0', | 1453 'win_release_OmitFramePointers': '0', |
| 1454 # Ditto for debug, to support bumping win_debug_Optimization. | 1454 # Ditto for debug, to support bumping win_debug_Optimization. |
| 1455 'win_debug_InlineFunctionExpansion': 0, | 1455 'win_debug_InlineFunctionExpansion': 0, |
| 1456 'win_debug_OmitFramePointers': 0, | 1456 'win_debug_OmitFramePointers': 0, |
| 1457 # Keep the code under #ifndef NVALGRIND. | 1457 # Keep the code under #ifndef NVALGRIND. |
| 1458 'release_valgrind_build': 1, | 1458 'release_valgrind_build': 1, |
| 1459 }], | 1459 }], |
| 1460 | 1460 |
| 1461 # Enable RLZ on Win, Mac and ChromeOS. | 1461 # Enable RLZ on Win, Mac and ChromeOS. |
| 1462 ['branding=="Chrome" and (OS=="win" or OS=="mac" or chromeos==1)', { | 1462 ['(OS=="win" or OS=="mac" or chromeos==1)', { |
|
Ilya Sherman
2012/12/15 00:57:16
This change doesn't look appropriate -- RLZ still
Ivan Korotkov
2012/12/17 09:05:01
This is for trybots, they are useless otherwise.
| |
| 1463 'enable_rlz%': 1, | 1463 'enable_rlz%': 1, |
| 1464 }], | 1464 }], |
| 1465 ], | 1465 ], |
| 1466 | 1466 |
| 1467 # List of default apps to install in new profiles. The first list contains | 1467 # List of default apps to install in new profiles. The first list contains |
| 1468 # the source files as found in svn. The second list, used only for linux, | 1468 # the source files as found in svn. The second list, used only for linux, |
| 1469 # contains the destination location for each of the files. When a crx | 1469 # contains the destination location for each of the files. When a crx |
| 1470 # is added or removed from the list, the chrome/browser/resources/ | 1470 # is added or removed from the list, the chrome/browser/resources/ |
| 1471 # default_apps/external_extensions.json file must also be updated. | 1471 # default_apps/external_extensions.json file must also be updated. |
| 1472 'default_apps_list': [ | 1472 'default_apps_list': [ |
| (...skipping 2457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3930 # settings in target dicts. SYMROOT is a special case, because many other | 3930 # settings in target dicts. SYMROOT is a special case, because many other |
| 3931 # Xcode variables depend on it, including variables such as | 3931 # Xcode variables depend on it, including variables such as |
| 3932 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3932 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3933 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3933 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3934 # files to appear (when present) in the UI as actual files and not red | 3934 # files to appear (when present) in the UI as actual files and not red |
| 3935 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3935 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3936 # and therefore SYMROOT, needs to be set at the project level. | 3936 # and therefore SYMROOT, needs to be set at the project level. |
| 3937 'SYMROOT': '<(DEPTH)/xcodebuild', | 3937 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3938 }, | 3938 }, |
| 3939 } | 3939 } |
| OLD | NEW |