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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 631 | 631 |
| 632 # Android OS includes support for proprietary codecs regardless of | 632 # Android OS includes support for proprietary codecs regardless of |
| 633 # building Chromium or Google Chrome. We also ship Google Chrome with | 633 # building Chromium or Google Chrome. We also ship Google Chrome with |
| 634 # proprietary codecs. | 634 # proprietary codecs. |
| 635 ['OS=="android" or branding=="Chrome"', { | 635 ['OS=="android" or branding=="Chrome"', { |
| 636 'proprietary_codecs%': 1, | 636 'proprietary_codecs%': 1, |
| 637 }, { | 637 }, { |
| 638 'proprietary_codecs%': 0, | 638 'proprietary_codecs%': 0, |
| 639 }], | 639 }], |
| 640 | 640 |
| 641 ['OS=="mac"', { | 641 ['OS=="mac" or OS=="ios"', { |
|
reveman
2013/12/14 05:32:59
How this worked before is a mystery to me.
reveman
2013/12/14 07:42:01
Ok, looks like we built both discardable_memory_ma
| |
| 642 'native_discardable_memory%': 1, | 642 'native_discardable_memory%': 1, |
| 643 'native_memory_pressure_signals%': 1, | 643 'native_memory_pressure_signals%': 1, |
| 644 }], | 644 }], |
| 645 | 645 |
| 646 # Enable autofill dialog for Android, Mac and Views-enabled platforms. | 646 # Enable autofill dialog for Android, Mac and Views-enabled platforms. |
| 647 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { | 647 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS =="mac"', { |
| 648 'enable_autofill_dialog%': 1 | 648 'enable_autofill_dialog%': 1 |
| 649 }], | 649 }], |
| 650 | 650 |
| 651 ['OS=="android" and android_webview_build==0', { | 651 ['OS=="android" and android_webview_build==0', { |
| (...skipping 4137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4789 # settings in target dicts. SYMROOT is a special case, because many other | 4789 # settings in target dicts. SYMROOT is a special case, because many other |
| 4790 # Xcode variables depend on it, including variables such as | 4790 # Xcode variables depend on it, including variables such as |
| 4791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4792 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4792 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4793 # files to appear (when present) in the UI as actual files and not red | 4793 # files to appear (when present) in the UI as actual files and not red |
| 4794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4795 # and therefore SYMROOT, needs to be set at the project level. | 4795 # and therefore SYMROOT, needs to be set at the project level. |
| 4796 'SYMROOT': '<(DEPTH)/xcodebuild', | 4796 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4797 }, | 4797 }, |
| 4798 } | 4798 } |
| OLD | NEW |