| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 24 matching lines...) Expand all Loading... |
| 35 # Disable touch support by default. | 35 # Disable touch support by default. |
| 36 'touchui%': 0, | 36 'touchui%': 0, |
| 37 | 37 |
| 38 # Disable webui dialog replacements for native dialogs by default. | 38 # Disable webui dialog replacements for native dialogs by default. |
| 39 # TODO(flackr): Change this to a runtime flag triggered by | 39 # TODO(flackr): Change this to a runtime flag triggered by |
| 40 # --pure-views so that these dialogs can be easily tested. | 40 # --pure-views so that these dialogs can be easily tested. |
| 41 'webui_dialogs%': 0, | 41 'webui_dialogs%': 0, |
| 42 | 42 |
| 43 # Whether the compositor is enabled on views. | 43 # Whether the compositor is enabled on views. |
| 44 'views_compositor%': 0, | 44 'views_compositor%': 0, |
| 45 |
| 46 # Whether or not we are building with the Aura window manager. |
| 47 'aura_wm%': 0, |
| 45 }, | 48 }, |
| 46 # Copy conditionally-set variables out one scope. | 49 # Copy conditionally-set variables out one scope. |
| 47 'chromeos%': '<(chromeos)', | 50 'chromeos%': '<(chromeos)', |
| 48 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', | 51 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
| 49 'touchui%': '<(touchui)', | 52 'touchui%': '<(touchui)', |
| 50 'webui_dialogs%': '<(webui_dialogs)', | 53 'webui_dialogs%': '<(webui_dialogs)', |
| 51 'views_compositor%': '<(views_compositor)', | 54 'views_compositor%': '<(views_compositor)', |
| 55 'aura_wm%': '<(aura_wm)', |
| 52 | 56 |
| 53 # Compute the architecture that we're building on. | 57 # Compute the architecture that we're building on. |
| 54 'conditions': [ | 58 'conditions': [ |
| 55 [ 'OS=="win" or OS=="mac"', { | 59 [ 'OS=="win" or OS=="mac"', { |
| 56 'host_arch%': 'ia32', | 60 'host_arch%': 'ia32', |
| 57 }, { | 61 }, { |
| 58 # This handles the Unix platforms for which there is some support. | 62 # This handles the Unix platforms for which there is some support. |
| 59 # Anything else gets passed through, which probably won't work very | 63 # Anything else gets passed through, which probably won't work very |
| 60 # well; such hosts should pass an explicit target_arch to gyp. | 64 # well; such hosts should pass an explicit target_arch to gyp. |
| 61 'host_arch%': | 65 'host_arch%': |
| (...skipping 12 matching lines...) Expand all Loading... |
| 74 ['touchui==1', { | 78 ['touchui==1', { |
| 75 'toolkit_uses_pure_views%': 1, | 79 'toolkit_uses_pure_views%': 1, |
| 76 }, { | 80 }, { |
| 77 'toolkit_uses_pure_views%': 0, | 81 'toolkit_uses_pure_views%': 0, |
| 78 }], | 82 }], |
| 79 | 83 |
| 80 # Use WebUI dialogs in TouchUI builds. | 84 # Use WebUI dialogs in TouchUI builds. |
| 81 ['touchui==1', { | 85 ['touchui==1', { |
| 82 'webui_dialogs%': 1, | 86 'webui_dialogs%': 1, |
| 83 }], | 87 }], |
| 88 |
| 89 # Use the views compositor when using the Aura window manager. |
| 90 ['aura_wm==1', { |
| 91 'views_compositor%': 1, |
| 92 }], |
| 84 ], | 93 ], |
| 85 }, | 94 }, |
| 86 | 95 |
| 87 # Copy conditionally-set variables out one scope. | 96 # Copy conditionally-set variables out one scope. |
| 88 'chromeos%': '<(chromeos)', | 97 'chromeos%': '<(chromeos)', |
| 89 'touchui%': '<(touchui)', | 98 'touchui%': '<(touchui)', |
| 90 'webui_dialogs%': '<(webui_dialogs)', | 99 'webui_dialogs%': '<(webui_dialogs)', |
| 91 'host_arch%': '<(host_arch)', | 100 'host_arch%': '<(host_arch)', |
| 92 'toolkit_views%': '<(toolkit_views)', | 101 'toolkit_views%': '<(toolkit_views)', |
| 93 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', | 102 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
| 94 'views_compositor%': '<(views_compositor)', | 103 'views_compositor%': '<(views_compositor)', |
| 104 'aura_wm%': '<(aura_wm)', |
| 95 | 105 |
| 96 # We used to provide a variable for changing how libraries were built. | 106 # We used to provide a variable for changing how libraries were built. |
| 97 # This variable remains until we can clean up all the users. | 107 # This variable remains until we can clean up all the users. |
| 98 # This needs to be one nested variables dict in so that dependent | 108 # This needs to be one nested variables dict in so that dependent |
| 99 # gyp files can make use of it in their outer variables. (Yikes!) | 109 # gyp files can make use of it in their outer variables. (Yikes!) |
| 100 # http://code.google.com/p/chromium/issues/detail?id=83308 | 110 # http://code.google.com/p/chromium/issues/detail?id=83308 |
| 101 'library%': 'static_library', | 111 'library%': 'static_library', |
| 102 | 112 |
| 103 # Override branding to select the desired branding flavor. | 113 # Override branding to select the desired branding flavor. |
| 104 'branding%': 'Chromium', | 114 'branding%': 'Chromium', |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 | 288 |
| 279 # Copy conditionally-set variables out one scope. | 289 # Copy conditionally-set variables out one scope. |
| 280 'branding%': '<(branding)', | 290 'branding%': '<(branding)', |
| 281 'buildtype%': '<(buildtype)', | 291 'buildtype%': '<(buildtype)', |
| 282 'target_arch%': '<(target_arch)', | 292 'target_arch%': '<(target_arch)', |
| 283 'host_arch%': '<(host_arch)', | 293 'host_arch%': '<(host_arch)', |
| 284 'library%': 'static_library', | 294 'library%': 'static_library', |
| 285 'toolkit_views%': '<(toolkit_views)', | 295 'toolkit_views%': '<(toolkit_views)', |
| 286 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', | 296 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
| 287 'views_compositor%': '<(views_compositor)', | 297 'views_compositor%': '<(views_compositor)', |
| 298 'aura_wm%': '<(aura_wm)', |
| 288 'os_posix%': '<(os_posix)', | 299 'os_posix%': '<(os_posix)', |
| 289 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 300 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 290 'use_skia%': '<(use_skia)', | 301 'use_skia%': '<(use_skia)', |
| 291 'use_x11%': '<(use_x11)', | 302 'use_x11%': '<(use_x11)', |
| 292 'use_gnome_keyring%': '<(use_gnome_keyring)', | 303 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 293 'linux_fpic%': '<(linux_fpic)', | 304 'linux_fpic%': '<(linux_fpic)', |
| 294 'enable_flapper_hacks%': '<(enable_flapper_hacks)', | 305 'enable_flapper_hacks%': '<(enable_flapper_hacks)', |
| 295 'chromeos%': '<(chromeos)', | 306 'chromeos%': '<(chromeos)', |
| 296 'touchui%': '<(touchui)', | 307 'touchui%': '<(touchui)', |
| 297 'webui_dialogs%': '<(webui_dialogs)', | 308 'webui_dialogs%': '<(webui_dialogs)', |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 }], | 779 }], |
| 769 ['toolkit_views==1', { | 780 ['toolkit_views==1', { |
| 770 'defines': ['TOOLKIT_VIEWS=1'], | 781 'defines': ['TOOLKIT_VIEWS=1'], |
| 771 }], | 782 }], |
| 772 ['toolkit_uses_pure_views==1', { | 783 ['toolkit_uses_pure_views==1', { |
| 773 'defines': ['TOOLKIT_USES_PURE_VIEWS=1'], | 784 'defines': ['TOOLKIT_USES_PURE_VIEWS=1'], |
| 774 }], | 785 }], |
| 775 ['views_compositor==1', { | 786 ['views_compositor==1', { |
| 776 'defines': ['VIEWS_COMPOSITOR=1'], | 787 'defines': ['VIEWS_COMPOSITOR=1'], |
| 777 }], | 788 }], |
| 789 ['aura_wm==1', { |
| 790 'defines': ['AURA_WM=1'], |
| 791 }], |
| 778 ['chromeos==1', { | 792 ['chromeos==1', { |
| 779 'defines': ['OS_CHROMEOS=1'], | 793 'defines': ['OS_CHROMEOS=1'], |
| 780 }], | 794 }], |
| 781 ['touchui==1', { | 795 ['touchui==1', { |
| 782 'defines': ['TOUCH_UI=1'], | 796 'defines': ['TOUCH_UI=1'], |
| 783 }], | 797 }], |
| 784 ['use_wayland==1', { | 798 ['use_wayland==1', { |
| 785 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], | 799 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], |
| 786 }], | 800 }], |
| 787 ['file_manager_extension==1', { | 801 ['file_manager_extension==1', { |
| (...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1967 # settings in target dicts. SYMROOT is a special case, because many other | 1981 # settings in target dicts. SYMROOT is a special case, because many other |
| 1968 # Xcode variables depend on it, including variables such as | 1982 # Xcode variables depend on it, including variables such as |
| 1969 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 1983 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 1970 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 1984 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 1971 # files to appear (when present) in the UI as actual files and not red | 1985 # files to appear (when present) in the UI as actual files and not red |
| 1972 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 1986 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 1973 # and therefore SYMROOT, needs to be set at the project level. | 1987 # and therefore SYMROOT, needs to be set at the project level. |
| 1974 'SYMROOT': '<(DEPTH)/xcodebuild', | 1988 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1975 }, | 1989 }, |
| 1976 } | 1990 } |
| OLD | NEW |