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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 380 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise | 380 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise |
| 381 # gyp will remove duplicate flags, causing isolate.py to be confused. | 381 # gyp will remove duplicate flags, causing isolate.py to be confused. |
| 382 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate', | 382 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate', |
| 383 | 383 |
| 384 # Force rlz to use chrome's networking stack. | 384 # Force rlz to use chrome's networking stack. |
| 385 'force_rlz_use_chrome_net%': 1, | 385 'force_rlz_use_chrome_net%': 1, |
| 386 | 386 |
| 387 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', | 387 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', |
| 388 'wix_path%': '<(DEPTH)/third_party/wix', | 388 'wix_path%': '<(DEPTH)/third_party/wix', |
| 389 | 389 |
| 390 # Whether or not to turn on vtable verification hardening. | |
|
Mark Mentovai
2012/08/13 20:07:12
Do you need this? Can you get rid of it and move t
| |
| 391 'use_vtable_verify%': 0, | |
| 392 | |
| 393 | |
| 390 'conditions': [ | 394 'conditions': [ |
| 391 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of | 395 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of |
| 392 # the 'conditions' clause. Initial attempts resulted in chromium and | 396 # the 'conditions' clause. Initial attempts resulted in chromium and |
| 393 # webkit disagreeing on its setting. | 397 # webkit disagreeing on its setting. |
| 394 ['OS=="mac"', { | 398 ['OS=="mac"', { |
| 395 'use_skia%': 1, | 399 'use_skia%': 1, |
| 396 }, { | 400 }, { |
| 397 'use_skia%': 1, | 401 'use_skia%': 1, |
| 398 }], | 402 }], |
| 399 | 403 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 608 'enable_automation%': '<(enable_automation)', | 612 'enable_automation%': '<(enable_automation)', |
| 609 'enable_printing%': '<(enable_printing)', | 613 'enable_printing%': '<(enable_printing)', |
| 610 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', | 614 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |
| 611 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', | 615 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', |
| 612 'enable_task_manager%': '<(enable_task_manager)', | 616 'enable_task_manager%': '<(enable_task_manager)', |
| 613 'sas_dll_path%': '<(sas_dll_path)', | 617 'sas_dll_path%': '<(sas_dll_path)', |
| 614 'wix_path%': '<(wix_path)', | 618 'wix_path%': '<(wix_path)', |
| 615 'android_upstream_bringup%': '<(android_upstream_bringup)', | 619 'android_upstream_bringup%': '<(android_upstream_bringup)', |
| 616 'use_system_libjpeg%': '<(use_system_libjpeg)', | 620 'use_system_libjpeg%': '<(use_system_libjpeg)', |
| 617 'android_build_type%': '<(android_build_type)', | 621 'android_build_type%': '<(android_build_type)', |
| 622 'use_vtable_verify%': '<(use_vtable_verify)', | |
| 618 | 623 |
| 619 # Use system yasm instead of bundled one. | 624 # Use system yasm instead of bundled one. |
| 620 'use_system_yasm%': 0, | 625 'use_system_yasm%': 0, |
| 621 | 626 |
| 622 # Default to enabled PIE; this is important for ASLR but we may need to be | 627 # Default to enabled PIE; this is important for ASLR but we may need to be |
| 623 # able to turn it off for various reasons. | 628 # able to turn it off for various reasons. |
| 624 'linux_disable_pie%': 0, | 629 'linux_disable_pie%': 0, |
| 625 | 630 |
| 626 # The release channel that this build targets. This is used to restrict | 631 # The release channel that this build targets. This is used to restrict |
| 627 # channel-specific build options, like which installer packages to create. | 632 # channel-specific build options, like which installer packages to create. |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1212 'win_release_InlineFunctionExpansion': '0', | 1217 'win_release_InlineFunctionExpansion': '0', |
| 1213 'win_release_OmitFramePointers': '0', | 1218 'win_release_OmitFramePointers': '0', |
| 1214 | 1219 |
| 1215 'linux_use_tcmalloc': 1, | 1220 'linux_use_tcmalloc': 1, |
| 1216 'release_valgrind_build': 1, | 1221 'release_valgrind_build': 1, |
| 1217 'werror': '', | 1222 'werror': '', |
| 1218 'component': 'static_library', | 1223 'component': 'static_library', |
| 1219 'use_system_zlib': 0, | 1224 'use_system_zlib': 0, |
| 1220 }], | 1225 }], |
| 1221 | 1226 |
| 1227 ['use_vtable_verify==1', { | |
| 1228 'debug_extra_cflags': '-fvtable-verify=std', | |
|
Mark Mentovai
2012/08/13 20:07:12
Fix up weird indentation here too.
| |
| 1229 'release_extra_cflags': '-fvtable-verify=std', | |
| 1230 }], | |
| 1231 | |
| 1222 # Build tweaks for DrMemory. | 1232 # Build tweaks for DrMemory. |
| 1223 # TODO(rnk): Combine with tsan config to share the builder. | 1233 # TODO(rnk): Combine with tsan config to share the builder. |
| 1224 # http://crbug.com/108155 | 1234 # http://crbug.com/108155 |
| 1225 ['build_for_tool=="drmemory"', { | 1235 ['build_for_tool=="drmemory"', { |
| 1226 # DrMemory can't handle the debug CRT dll, so build static. | 1236 # DrMemory can't handle the debug CRT dll, so build static. |
| 1227 'component': 'static_library', | 1237 'component': 'static_library', |
| 1228 # These runtime checks force initialization of stack vars which blocks | 1238 # These runtime checks force initialization of stack vars which blocks |
| 1229 # DrMemory's uninit detection. | 1239 # DrMemory's uninit detection. |
| 1230 'win_debug_RuntimeChecks': '0', | 1240 'win_debug_RuntimeChecks': '0', |
| 1231 # Iterator debugging is slow. | 1241 # Iterator debugging is slow. |
| (...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3346 # settings in target dicts. SYMROOT is a special case, because many other | 3356 # settings in target dicts. SYMROOT is a special case, because many other |
| 3347 # Xcode variables depend on it, including variables such as | 3357 # Xcode variables depend on it, including variables such as |
| 3348 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3358 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3349 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3359 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3350 # files to appear (when present) in the UI as actual files and not red | 3360 # files to appear (when present) in the UI as actual files and not red |
| 3351 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3361 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3352 # and therefore SYMROOT, needs to be set at the project level. | 3362 # and therefore SYMROOT, needs to be set at the project level. |
| 3353 'SYMROOT': '<(DEPTH)/xcodebuild', | 3363 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3354 }, | 3364 }, |
| 3355 } | 3365 } |
| OLD | NEW |