| 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 623 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 634         # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code | 634         # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code | 
| 635         # again. | 635         # again. | 
| 636         # NOTE: The check for disable_nacl==0 and component=="static_library" | 636         # NOTE: The check for disable_nacl==0 and component=="static_library" | 
| 637         # can't be used here because these variables are not defined yet, but it | 637         # can't be used here because these variables are not defined yet, but it | 
| 638         # is still not supported. | 638         # is still not supported. | 
| 639         ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android"
       and chromeos==0', { | 639         ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android"
       and chromeos==0', { | 
| 640           'test_isolation_mode%': 'check', | 640           'test_isolation_mode%': 'check', | 
| 641         }, { | 641         }, { | 
| 642           'test_isolation_mode%': 'noop', | 642           'test_isolation_mode%': 'noop', | 
| 643         }], | 643         }], | 
| 644         # Whether Android ARM build uses OpenMAX DL FFT. | 644         # Whether Android ARM build uses OpenMAX DL FFT. | 
| 645         ['OS=="android" and target_arch=="arm" and android_webview_build==0', { | 645         ['OS=="android" and target_arch=="arm" and android_webview_build==0', { | 
| 646           # Currently only supported on Android ARM, without webview. | 646           # Currently only supported on Android ARM, without webview. | 
| 647           # When enabled, this will also enable WebAudio on Android | 647           # When enabled, this will also enable WebAudio on Android | 
| 648           # ARM.  Default is disabled. | 648           # ARM.  Default is disabled. | 
| 649           'use_openmax_dl_fft%': 0, | 649           'use_openmax_dl_fft%': 0, | 
| 650         }, { | 650         }, { | 
| 651           'use_openmax_dl_fft%': 0, | 651           'use_openmax_dl_fft%': 0, | 
| 652         }], | 652         }], | 
| 653       ], | 653       ], | 
| 654 | 654 | 
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1041     'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))', | 1041     'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))', | 
| 1042     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', | 1042     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', | 
| 1043 | 1043 | 
| 1044     'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', | 1044     'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', | 
| 1045     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', | 1045     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', | 
| 1046 | 1046 | 
| 1047     # Whether we are using the rlz library or not.  Platforms like Android send | 1047     # Whether we are using the rlz library or not.  Platforms like Android send | 
| 1048     # rlz codes for searches but do not use the library. | 1048     # rlz codes for searches but do not use the library. | 
| 1049     'enable_rlz%': 0, | 1049     'enable_rlz%': 0, | 
| 1050 | 1050 | 
|  | 1051     # MDNS is disabled by default. | 
|  | 1052     'enable_mdns%' : 0, | 
|  | 1053 | 
| 1051     'conditions': [ | 1054     'conditions': [ | 
| 1052       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa
      ult_path))"=="True"', { | 1055       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa
      ult_path))"=="True"', { | 
| 1053         'windows_sdk_path%': '<(windows_sdk_default_path)', | 1056         'windows_sdk_path%': '<(windows_sdk_default_path)', | 
| 1054       }, { | 1057       }, { | 
| 1055         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', | 1058         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', | 
| 1056       }], | 1059       }], | 
| 1057       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa
      ult_path))"=="True"', { | 1060       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa
      ult_path))"=="True"', { | 
| 1058         'directx_sdk_path%': '<(directx_sdk_default_path)', | 1061         'directx_sdk_path%': '<(directx_sdk_default_path)', | 
| 1059       }, { | 1062       }, { | 
| 1060         'directx_sdk_path%': '$(DXSDK_DIR)', | 1063         'directx_sdk_path%': '$(DXSDK_DIR)', | 
| (...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2101       }], | 2104       }], | 
| 2102       ['enable_managed_users==1', { | 2105       ['enable_managed_users==1', { | 
| 2103         'defines': ['ENABLE_MANAGED_USERS=1'], | 2106         'defines': ['ENABLE_MANAGED_USERS=1'], | 
| 2104       }], | 2107       }], | 
| 2105       ['spdy_proxy_auth_origin != ""', { | 2108       ['spdy_proxy_auth_origin != ""', { | 
| 2106         'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], | 2109         'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], | 
| 2107       }], | 2110       }], | 
| 2108       ['spdy_proxy_auth_property != ""', { | 2111       ['spdy_proxy_auth_property != ""', { | 
| 2109         'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], | 2112         'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], | 
| 2110       }], | 2113       }], | 
|  | 2114       ['enable_mdns==1', { | 
|  | 2115         'defines': ['ENABLE_MDNS=1'], | 
|  | 2116       }] | 
| 2111     ],  # conditions for 'target_defaults' | 2117     ],  # conditions for 'target_defaults' | 
| 2112     'target_conditions': [ | 2118     'target_conditions': [ | 
| 2113       ['enable_wexit_time_destructors==1', { | 2119       ['enable_wexit_time_destructors==1', { | 
| 2114         'conditions': [ | 2120         'conditions': [ | 
| 2115           [ 'clang==1', { | 2121           [ 'clang==1', { | 
| 2116             'cflags': [ | 2122             'cflags': [ | 
| 2117               '-Wexit-time-destructors', | 2123               '-Wexit-time-destructors', | 
| 2118             ], | 2124             ], | 
| 2119             'xcode_settings': { | 2125             'xcode_settings': { | 
| 2120               'WARNING_CFLAGS': [ | 2126               'WARNING_CFLAGS': [ | 
| (...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4246     # settings in target dicts.  SYMROOT is a special case, because many other | 4252     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4247     # Xcode variables depend on it, including variables such as | 4253     # Xcode variables depend on it, including variables such as | 
| 4248     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4254     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4249     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4255     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4250     # files to appear (when present) in the UI as actual files and not red | 4256     # files to appear (when present) in the UI as actual files and not red | 
| 4251     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4257     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4252     # and therefore SYMROOT, needs to be set at the project level. | 4258     # and therefore SYMROOT, needs to be set at the project level. | 
| 4253     'SYMROOT': '<(DEPTH)/xcodebuild', | 4259     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4254   }, | 4260   }, | 
| 4255 } | 4261 } | 
| OLD | NEW | 
|---|