| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 708e12c2aa3f6ae9ff536f5c7a71f33ca6d4f34f..b32ca5432b3175ac5771005c61179ad8dfa79622 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -346,6 +346,10 @@
|
| # by the GYP command line or by ~/.gyp/include.gypi.
|
| 'component%': 'static_library',
|
|
|
| + # /analyze is off by default on Windows because it is very slow and noisy.
|
| + # Enable with GYP_DEFINES=win_analyze=1
|
| + 'win_analyze%': 0,
|
| +
|
| # Set to select the Title Case versions of strings in GRD files.
|
| 'use_titlecase_in_grd%': 0,
|
|
|
| @@ -1004,6 +1008,14 @@
|
| }, {
|
| 'optimize_jni_generation%': 0,
|
| }],
|
| +
|
| + # TODO(baixo): Enable v8_use_external_startup_data
|
| + # http://crbug.com/421063
|
| + ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', {
|
| + 'v8_use_external_startup_data': 0,
|
| + }, {
|
| + 'v8_use_external_startup_data': 0,
|
| + }],
|
| ],
|
|
|
| # Set this to 1 to enable use of concatenated impulse responses
|
| @@ -1108,6 +1120,7 @@
|
| 'chroot_cmd%': '<(chroot_cmd)',
|
| 'system_libdir%': '<(system_libdir)',
|
| 'component%': '<(component)',
|
| + 'win_analyze%': '<(win_analyze)',
|
| 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_generation)',
|
| 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)',
|
| 'use_third_party_translations%': '<(use_third_party_translations)',
|
| @@ -1205,6 +1218,7 @@
|
| 'video_hole%': '<(video_hole)',
|
| 'enable_load_completion_hacks%': '<(enable_load_completion_hacks)',
|
| 'support_pre_M6_history_database%': '<(support_pre_M6_history_database)',
|
| + 'v8_use_external_startup_data': '<(v8_use_external_startup_data)',
|
|
|
| # Whether or not we are building the Athena shell.
|
| 'use_athena%': '0',
|
| @@ -1354,9 +1368,6 @@
|
| # Enable new NPDevice API.
|
| 'enable_new_npdevice_api%': 0,
|
|
|
| - # Enable EGLImage support in OpenMAX
|
| - 'enable_eglimage%': 1,
|
| -
|
| # .gyp files or targets should set chromium_code to 1 if they build
|
| # Chromium-specific code, as opposed to external code. This variable is
|
| # used to control such things as the set of warnings to enable, and
|
| @@ -1460,9 +1471,6 @@
|
| # Compile d8 for the host toolset.
|
| 'v8_toolset_for_d8': 'host',
|
|
|
| - # Use the chromium skia by default.
|
| - 'use_system_skia%': '0',
|
| -
|
| # Use brlapi from brltty for braille display support.
|
| 'use_brlapi%': 0,
|
|
|
| @@ -2753,11 +2761,6 @@
|
| }],
|
| ],
|
| }],
|
| - ['enable_eglimage==1', {
|
| - 'defines': [
|
| - 'ENABLE_EGLIMAGE=1',
|
| - ],
|
| - }],
|
| ['asan==1', {
|
| 'defines': [
|
| 'ADDRESS_SANITIZER',
|
| @@ -2804,8 +2807,42 @@
|
| 'DebugInformationFormat': '1',
|
| }
|
| }
|
| - }],
|
| - ], # win_z7!=0
|
| + }], # win_z7!=0
|
| + ['win_analyze', {
|
| + 'defines!': [
|
| + # This is prohibited when running /analyze.
|
| + '_USING_V110_SDK71_',
|
| + ],
|
| + 'msvs_settings': {
|
| + 'VCCLCompilerTool': {
|
| + # Set WarnAsError to false to disable this setting for most
|
| + # projects so that compilation continues.
|
| + 'WarnAsError': 'false',
|
| + # When win_analyze is specified add the /analyze switch.
|
| + # Also add /WX- to force-disable WarnAsError for projects that
|
| + # override WarnAsError.
|
| + # Also, disable various noisy warnings that have low value.
|
| + 'AdditionalOptions': [
|
| + '/analyze',
|
| + '/WX-',
|
| + '/wd6011', # Dereferencing NULL pointer
|
| + '/wd6312', # Possible infinite loop: use of the constant
|
| + # EXCEPTION_CONTINUE_EXECUTION in the exception-filter
|
| + '/wd6326', # Potential comparison of constant with constant
|
| + '/wd28159', # Consider using 'GetTickCount64'
|
| + '/wd28204', # Inconsistent SAL annotations
|
| + '/wd28251', # Inconsistent SAL annotations
|
| + '/wd28252', # Inconsistent SAL annotations
|
| + '/wd28253', # Inconsistent SAL annotations
|
| + '/wd28196', # The precondition is not satisfied
|
| + '/wd28301', # Inconsistent SAL annotations
|
| + '/wd6340', # Sign mismatch in function parameter
|
| + '/wd28182', # Dereferencing NULL pointer
|
| + ],
|
| + },
|
| + },
|
| + }], # win_analyze
|
| + ],
|
| }], # OS==win
|
| ['chromecast==1', {
|
| 'defines': [
|
| @@ -2933,6 +2970,9 @@
|
| ['enable_load_completion_hacks==1', {
|
| 'defines': ['ENABLE_LOAD_COMPLETION_HACKS=1'],
|
| }],
|
| + ['v8_use_external_startup_data==1', {
|
| + 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'],
|
| + }],
|
| ], # conditions for 'target_defaults'
|
| 'target_conditions': [
|
| ['<(use_openssl)==1', {
|
|
|