| 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 636 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 647         ['OS=="mac" or OS=="ios"', { | 647         ['OS=="mac" or OS=="ios"', { | 
| 648           'native_discardable_memory%': 1, | 648           'native_discardable_memory%': 1, | 
| 649           'native_memory_pressure_signals%': 1, | 649           'native_memory_pressure_signals%': 1, | 
| 650         }], | 650         }], | 
| 651 | 651 | 
| 652         # Enable autofill dialog for Android, Mac and Views-enabled platforms. | 652         # Enable autofill dialog for Android, Mac and Views-enabled platforms. | 
| 653         ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS
      =="mac"', { | 653         ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS
      =="mac"', { | 
| 654           'enable_autofill_dialog%': 1 | 654           'enable_autofill_dialog%': 1 | 
| 655         }], | 655         }], | 
| 656 | 656 | 
| 657         ['OS=="android" and android_webview_build==0', { | 657         ['OS=="android"', { | 
| 658           'enable_webrtc%': 1, | 658           'enable_webrtc%': 1, | 
| 659         }], | 659         }], | 
| 660 | 660 | 
| 661         # Disable WebRTC for building WebView as part of Android system. |  | 
| 662         # TODO(boliu): Decide if we want WebRTC, and if so, also merge |  | 
| 663         # the necessary third_party repositories. |  | 
| 664         ['OS=="android" and android_webview_build==1', { |  | 
| 665           'enable_webrtc%': 0, |  | 
| 666         }], |  | 
| 667 |  | 
| 668         ['OS=="ios"', { | 661         ['OS=="ios"', { | 
| 669           'disable_ftp_support%': 1, | 662           'disable_ftp_support%': 1, | 
| 670           'enable_automation%': 0, | 663           'enable_automation%': 0, | 
| 671           'enable_extensions%': 0, | 664           'enable_extensions%': 0, | 
| 672           'enable_google_now%': 0, | 665           'enable_google_now%': 0, | 
| 673           'cld_version%': 1, | 666           'cld_version%': 1, | 
| 674           'enable_printing%': 0, | 667           'enable_printing%': 0, | 
| 675           'enable_session_service%': 0, | 668           'enable_session_service%': 0, | 
| 676           'enable_themes%': 0, | 669           'enable_themes%': 0, | 
| 677           'enable_webrtc%': 0, | 670           'enable_webrtc%': 0, | 
| (...skipping 4327 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5005     # settings in target dicts.  SYMROOT is a special case, because many other | 4998     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5006     # Xcode variables depend on it, including variables such as | 4999     # Xcode variables depend on it, including variables such as | 
| 5007     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5000     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5008     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5001     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5009     # files to appear (when present) in the UI as actual files and not red | 5002     # files to appear (when present) in the UI as actual files and not red | 
| 5010     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5003     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5011     # and therefore SYMROOT, needs to be set at the project level. | 5004     # and therefore SYMROOT, needs to be set at the project level. | 
| 5012     'SYMROOT': '<(DEPTH)/xcodebuild', | 5005     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5013   }, | 5006   }, | 
| 5014 } | 5007 } | 
| OLD | NEW | 
|---|