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 961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 972 'gtest_target_type%': 'shared_library', | 972 'gtest_target_type%': 'shared_library', |
| 973 | 973 |
| 974 # Uses system APIs for decoding audio and video. | 974 # Uses system APIs for decoding audio and video. |
| 975 'use_libffmpeg%': '0', | 975 'use_libffmpeg%': '0', |
| 976 | 976 |
| 977 # Always use the chromium skia. The use_system_harfbuzz needs to | 977 # Always use the chromium skia. The use_system_harfbuzz needs to |
| 978 # match use_system_skia. | 978 # match use_system_skia. |
| 979 'use_system_skia%': '0', | 979 'use_system_skia%': '0', |
| 980 'use_system_harfbuzz%': '0', | 980 'use_system_harfbuzz%': '0', |
| 981 | 981 |
| 982 # Always use the system zlib. | |
| 983 'use_system_zlib%': 1, | |
|
klobag.chromium
2012/08/03 23:11:57
I assume that you have changed zlib.gyp.
agl
2012/08/06 11:47:45
Not yet, but that's a future CL.
| |
| 984 | |
| 985 # Configure crash reporting and build options based on release type. | 982 # Configure crash reporting and build options based on release type. |
| 986 'conditions': [ | 983 'conditions': [ |
| 987 ['buildtype=="Official"', { | 984 ['buildtype=="Official"', { |
| 988 # Only report crash dumps for Official builds. | 985 # Only report crash dumps for Official builds. |
| 989 'linux_breakpad%': 1, | 986 'linux_breakpad%': 1, |
| 990 }, { | 987 }, { |
| 991 'linux_breakpad%': 0, | 988 'linux_breakpad%': 0, |
| 992 }], | 989 }], |
| 993 ], | 990 ], |
| 994 | 991 |
| (...skipping 2346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3341 # settings in target dicts. SYMROOT is a special case, because many other | 3338 # settings in target dicts. SYMROOT is a special case, because many other |
| 3342 # Xcode variables depend on it, including variables such as | 3339 # Xcode variables depend on it, including variables such as |
| 3343 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3340 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3344 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3341 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3345 # files to appear (when present) in the UI as actual files and not red | 3342 # files to appear (when present) in the UI as actual files and not red |
| 3346 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3343 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3347 # and therefore SYMROOT, needs to be set at the project level. | 3344 # and therefore SYMROOT, needs to be set at the project level. |
| 3348 'SYMROOT': '<(DEPTH)/xcodebuild', | 3345 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3349 }, | 3346 }, |
| 3350 } | 3347 } |
| OLD | NEW |