| 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 17 matching lines...) Expand all Loading... |
| 28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used | 28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used |
| 29 # to replace the corresponding GTK implementation in such a way | 29 # to replace the corresponding GTK implementation in such a way |
| 30 # that GTK and PureViews can coexist. This intermediate solution | 30 # that GTK and PureViews can coexist. This intermediate solution |
| 31 # allow us to switch the view implementations using | 31 # allow us to switch the view implementations using |
| 32 # --use-pure-views, without breaking exiting gtk implementation. | 32 # --use-pure-views, without breaking exiting gtk implementation. |
| 33 'toolkit_uses_pure_views%': 0, | 33 'toolkit_uses_pure_views%': 0, |
| 34 | 34 |
| 35 # Disable touch support by default. | 35 # Disable touch support by default. |
| 36 'touchui%': 0, | 36 'touchui%': 0, |
| 37 | 37 |
| 38 # Disable webui certificate viewer until it is complete. | 38 # Disable webui dialog replacements for native dialogs by default. |
| 39 'webui_certificate_viewer%': 0, | 39 # TODO(flackr): Change this to a runtime flag triggered by |
| 40 # --pure-views so that these dialogs can be easily tested. |
| 41 'webui_dialogs%': 0, |
| 40 | 42 |
| 41 # Whether the compositor is enabled on views. | 43 # Whether the compositor is enabled on views. |
| 42 'views_compositor%': 0, | 44 'views_compositor%': 0, |
| 43 }, | 45 }, |
| 44 # Copy conditionally-set variables out one scope. | 46 # Copy conditionally-set variables out one scope. |
| 45 'chromeos%': '<(chromeos)', | 47 'chromeos%': '<(chromeos)', |
| 46 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', | 48 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
| 47 'touchui%': '<(touchui)', | 49 'touchui%': '<(touchui)', |
| 48 'webui_certificate_viewer%': '<(webui_certificate_viewer)', | 50 'webui_dialogs%': '<(webui_dialogs)', |
| 49 'views_compositor%': '<(views_compositor)', | 51 'views_compositor%': '<(views_compositor)', |
| 50 | 52 |
| 51 # Compute the architecture that we're building on. | 53 # Compute the architecture that we're building on. |
| 52 'conditions': [ | 54 'conditions': [ |
| 53 [ 'OS=="win" or OS=="mac"', { | 55 [ 'OS=="win" or OS=="mac"', { |
| 54 'host_arch%': 'ia32', | 56 'host_arch%': 'ia32', |
| 55 }, { | 57 }, { |
| 56 # This handles the Unix platforms for which there is some support. | 58 # This handles the Unix platforms for which there is some support. |
| 57 # Anything else gets passed through, which probably won't work very | 59 # Anything else gets passed through, which probably won't work very |
| 58 # well; such hosts should pass an explicit target_arch to gyp. | 60 # well; such hosts should pass an explicit target_arch to gyp. |
| 59 'host_arch%': | 61 'host_arch%': |
| 60 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a
rm.*/arm/;s/i86pc/ia32/")', | 62 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a
rm.*/arm/;s/i86pc/ia32/")', |
| 61 }], | 63 }], |
| 62 | 64 |
| 63 # Set default value of toolkit_views on for Windows, Chrome OS | 65 # Set default value of toolkit_views on for Windows, Chrome OS |
| 64 # and the touch UI. | 66 # and the touch UI. |
| 65 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1
', { | 67 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1
', { |
| 66 'toolkit_views%': 1, | 68 'toolkit_views%': 1, |
| 67 }, { | 69 }, { |
| 68 'toolkit_views%': 0, | 70 'toolkit_views%': 0, |
| 69 }], | 71 }], |
| 70 | 72 |
| 71 # Views are always Pure in Touch case | 73 # Views are always Pure in Touch case |
| 72 ['touchui==1', { | 74 ['touchui==1', { |
| 73 'toolkit_uses_pure_views%': 1, | 75 'toolkit_uses_pure_views%': 1, |
| 74 }, { | 76 }, { |
| 75 'toolkit_uses_pure_views%': 0, | 77 'toolkit_uses_pure_views%': 0, |
| 76 }], | 78 }], |
| 77 | 79 |
| 78 # Use WebUI certificate viewer in Touch case | 80 # Use WebUI dialogs in TouchUI builds. |
| 79 ['touchui==1', { | 81 ['touchui==1', { |
| 80 'webui_certificate_viewer%': 1 | 82 'webui_dialogs%': 1, |
| 81 }], | 83 }], |
| 82 ], | 84 ], |
| 83 }, | 85 }, |
| 84 | 86 |
| 85 # Copy conditionally-set variables out one scope. | 87 # Copy conditionally-set variables out one scope. |
| 86 'chromeos%': '<(chromeos)', | 88 'chromeos%': '<(chromeos)', |
| 87 'touchui%': '<(touchui)', | 89 'touchui%': '<(touchui)', |
| 88 'webui_certificate_viewer%': '<(webui_certificate_viewer)', | 90 'webui_dialogs%': '<(webui_dialogs)', |
| 89 'host_arch%': '<(host_arch)', | 91 'host_arch%': '<(host_arch)', |
| 90 'toolkit_views%': '<(toolkit_views)', | 92 'toolkit_views%': '<(toolkit_views)', |
| 91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', | 93 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
| 92 'views_compositor%': '<(views_compositor)', | 94 'views_compositor%': '<(views_compositor)', |
| 93 | 95 |
| 94 # We used to provide a variable for changing how libraries were built. | 96 # We used to provide a variable for changing how libraries were built. |
| 95 # This variable remains until we can clean up all the users. | 97 # This variable remains until we can clean up all the users. |
| 96 # This needs to be one nested variables dict in so that dependent | 98 # This needs to be one nested variables dict in so that dependent |
| 97 # gyp files can make use of it in their outer variables. (Yikes!) | 99 # gyp files can make use of it in their outer variables. (Yikes!) |
| 98 # http://code.google.com/p/chromium/issues/detail?id=83308 | 100 # http://code.google.com/p/chromium/issues/detail?id=83308 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 'views_compositor%': '<(views_compositor)', | 287 'views_compositor%': '<(views_compositor)', |
| 286 'os_posix%': '<(os_posix)', | 288 'os_posix%': '<(os_posix)', |
| 287 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 289 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 288 'use_skia%': '<(use_skia)', | 290 'use_skia%': '<(use_skia)', |
| 289 'use_x11%': '<(use_x11)', | 291 'use_x11%': '<(use_x11)', |
| 290 'use_gnome_keyring%': '<(use_gnome_keyring)', | 292 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 291 'linux_fpic%': '<(linux_fpic)', | 293 'linux_fpic%': '<(linux_fpic)', |
| 292 'enable_flapper_hacks%': '<(enable_flapper_hacks)', | 294 'enable_flapper_hacks%': '<(enable_flapper_hacks)', |
| 293 'chromeos%': '<(chromeos)', | 295 'chromeos%': '<(chromeos)', |
| 294 'touchui%': '<(touchui)', | 296 'touchui%': '<(touchui)', |
| 295 'webui_certificate_viewer%': '<(webui_certificate_viewer)', | 297 'webui_dialogs%': '<(webui_dialogs)', |
| 296 'file_manager_extension%': '<(file_manager_extension)', | 298 'file_manager_extension%': '<(file_manager_extension)', |
| 297 'webui_task_manager%': '<(webui_task_manager)', | 299 'webui_task_manager%': '<(webui_task_manager)', |
| 298 'inside_chromium_build%': '<(inside_chromium_build)', | 300 'inside_chromium_build%': '<(inside_chromium_build)', |
| 299 'fastbuild%': '<(fastbuild)', | 301 'fastbuild%': '<(fastbuild)', |
| 300 'python_ver%': '<(python_ver)', | 302 'python_ver%': '<(python_ver)', |
| 301 'armv7%': '<(armv7)', | 303 'armv7%': '<(armv7)', |
| 302 'arm_neon%': '<(arm_neon)', | 304 'arm_neon%': '<(arm_neon)', |
| 303 'sysroot%': '<(sysroot)', | 305 'sysroot%': '<(sysroot)', |
| 304 'disable_sse2%': '<(disable_sse2)', | 306 'disable_sse2%': '<(disable_sse2)', |
| 305 'component%': '<(component)', | 307 'component%': '<(component)', |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 }], | 656 }], |
| 655 ['toolkit_views==1', { | 657 ['toolkit_views==1', { |
| 656 'grit_defines': ['-D', 'toolkit_views'], | 658 'grit_defines': ['-D', 'toolkit_views'], |
| 657 }], | 659 }], |
| 658 ['toolkit_uses_pure_views==1', { | 660 ['toolkit_uses_pure_views==1', { |
| 659 'grit_defines': ['-D', 'toolkit_uses_pure_views'], | 661 'grit_defines': ['-D', 'toolkit_uses_pure_views'], |
| 660 }], | 662 }], |
| 661 ['touchui==1', { | 663 ['touchui==1', { |
| 662 'grit_defines': ['-D', 'touchui'], | 664 'grit_defines': ['-D', 'touchui'], |
| 663 }], | 665 }], |
| 664 ['webui_certificate_viewer==1', { | 666 ['webui_dialogs==1', { |
| 665 'grit_defines': ['-D', 'webui_certificate_viewer'], | 667 'grit_defines': ['-D', 'webui_dialogs'], |
| 666 }], | 668 }], |
| 667 ['file_manager_extension==1', { | 669 ['file_manager_extension==1', { |
| 668 'grit_defines': ['-D', 'file_manager_extension'], | 670 'grit_defines': ['-D', 'file_manager_extension'], |
| 669 }], | 671 }], |
| 670 ['webui_task_manager==1', { | 672 ['webui_task_manager==1', { |
| 671 'grit_defines': ['-D', 'webui_task_manager'], | 673 'grit_defines': ['-D', 'webui_task_manager'], |
| 672 }], | 674 }], |
| 673 ['remoting==1', { | 675 ['remoting==1', { |
| 674 'grit_defines': ['-D', 'remoting'], | 676 'grit_defines': ['-D', 'remoting'], |
| 675 }], | 677 }], |
| (...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1986 # settings in target dicts. SYMROOT is a special case, because many other | 1988 # settings in target dicts. SYMROOT is a special case, because many other |
| 1987 # Xcode variables depend on it, including variables such as | 1989 # Xcode variables depend on it, including variables such as |
| 1988 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 1990 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 1989 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 1991 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 1990 # files to appear (when present) in the UI as actual files and not red | 1992 # files to appear (when present) in the UI as actual files and not red |
| 1991 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 1993 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 1992 # and therefore SYMROOT, needs to be set at the project level. | 1994 # and therefore SYMROOT, needs to be set at the project level. |
| 1993 'SYMROOT': '<(DEPTH)/xcodebuild', | 1995 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1994 }, | 1996 }, |
| 1995 } | 1997 } |
| OLD | NEW |