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 27 matching lines...) Expand all Loading... | |
| 38 | 38 |
| 39 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 | 39 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 |
| 40 'use_openssl%': 0, | 40 'use_openssl%': 0, |
| 41 | 41 |
| 42 # Disable Virtual keyboard support by default. | 42 # Disable Virtual keyboard support by default. |
| 43 'use_virtual_keyboard%': 0, | 43 'use_virtual_keyboard%': 0, |
| 44 | 44 |
| 45 # Default setting for use_skia on mac platform. | 45 # Default setting for use_skia on mac platform. |
| 46 # This is typically overridden in use_skia_on_mac.gypi. | 46 # This is typically overridden in use_skia_on_mac.gypi. |
| 47 'use_skia_on_mac%': 0, | 47 'use_skia_on_mac%': 0, |
| 48 | |
| 49 # Default to show aura-window-mode flag in about://flags. | |
|
James Cook
2012/01/07 04:26:48
Maybe "Whether or not to show the aura-window-mode
alicet1
2012/01/09 08:52:16
done.
| |
| 50 # TODO(alicet): Remove this when we can expose the flag to | |
| 51 # all chromeos platforms. | |
| 52 'show_about_flag_aura_window_mode': 0, | |
|
James Cook
2012/01/07 04:26:48
Maybe aura_show_about_flag_window_mode? Or some o
alicet1
2012/01/09 08:52:16
Done.
| |
| 48 }, | 53 }, |
| 49 # Copy conditionally-set variables out one scope. | 54 # Copy conditionally-set variables out one scope. |
| 50 'chromeos%': '<(chromeos)', | 55 'chromeos%': '<(chromeos)', |
| 56 'show_about_flag_aura_window_mode%': '<(show_about_flag_aura_window_mode )', | |
| 51 'views_compositor%': '<(views_compositor)', | 57 'views_compositor%': '<(views_compositor)', |
| 52 'use_aura%': '<(use_aura)', | 58 'use_aura%': '<(use_aura)', |
| 53 'use_ash%': '<(use_ash)', | 59 'use_ash%': '<(use_ash)', |
| 54 'use_openssl%': '<(use_openssl)', | 60 'use_openssl%': '<(use_openssl)', |
| 55 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 61 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 56 'use_skia_on_mac%': '<(use_skia_on_mac)', | 62 'use_skia_on_mac%': '<(use_skia_on_mac)', |
| 57 | 63 |
| 58 # Compute the architecture that we're building on. | 64 # Compute the architecture that we're building on. |
| 59 'conditions': [ | 65 'conditions': [ |
| 60 [ 'OS=="win" or OS=="mac"', { | 66 [ 'OS=="win" or OS=="mac"', { |
| 61 'host_arch%': 'ia32', | 67 'host_arch%': 'ia32', |
| 62 }, { | 68 }, { |
| 63 # This handles the Unix platforms for which there is some support. | 69 # This handles the Unix platforms for which there is some support. |
| 64 # Anything else gets passed through, which probably won't work very | 70 # Anything else gets passed through, which probably won't work very |
| 65 # well; such hosts should pass an explicit target_arch to gyp. | 71 # well; such hosts should pass an explicit target_arch to gyp. |
| 66 'host_arch%': | 72 'host_arch%': |
| 67 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', | 73 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', |
| 68 }], | 74 }], |
| 69 | 75 |
| 70 # Ash requires Aura. | 76 # Ash requires Aura. |
| 71 ['use_ash==1', { | 77 ['use_ash==1', { |
| 72 'use_aura%': 1, | 78 'use_aura%': 1, |
| 73 }], | 79 }], |
| 74 | 80 |
| 81 # show aura-window-mode about flag by default. | |
| 82 ['use_aura==1', { | |
| 83 'show_about_flag_aura_window_mode': 1, | |
| 84 }], | |
| 85 | |
| 75 # Set default value of toolkit_views based on OS. | 86 # Set default value of toolkit_views based on OS. |
| 76 ['OS=="win" or chromeos==1 or use_aura==1', { | 87 ['OS=="win" or chromeos==1 or use_aura==1', { |
| 77 'toolkit_views%': 1, | 88 'toolkit_views%': 1, |
| 78 }, { | 89 }, { |
| 79 'toolkit_views%': 0, | 90 'toolkit_views%': 0, |
| 80 }], | 91 }], |
| 81 | 92 |
| 82 # Use the views compositor when using the Aura window manager. | 93 # Use the views compositor when using the Aura window manager. |
| 83 ['use_aura==1', { | 94 ['use_aura==1', { |
| 84 'views_compositor%': 1, | 95 'views_compositor%': 1, |
| 85 }], | 96 }], |
| 86 | 97 |
| 87 # Use the WebKit compositor for ui, when Aura is on. | 98 # Use the WebKit compositor for ui, when Aura is on. |
| 88 ['use_aura==1', { | 99 ['use_aura==1', { |
| 89 'use_webkit_compositor%': 1, | 100 'use_webkit_compositor%': 1, |
| 90 }, { | 101 }, { |
| 91 'use_webkit_compositor%': 0, | 102 'use_webkit_compositor%': 0, |
| 92 }], | 103 }], |
| 93 ], | 104 ], |
| 94 }, | 105 }, |
| 95 | 106 |
| 96 # Copy conditionally-set variables out one scope. | 107 # Copy conditionally-set variables out one scope. |
| 97 'chromeos%': '<(chromeos)', | 108 'chromeos%': '<(chromeos)', |
| 98 'host_arch%': '<(host_arch)', | 109 'host_arch%': '<(host_arch)', |
| 110 'show_about_flag_aura_window_mode%': '<(show_about_flag_aura_window_mode)' , | |
| 99 'toolkit_views%': '<(toolkit_views)', | 111 'toolkit_views%': '<(toolkit_views)', |
| 100 'views_compositor%': '<(views_compositor)', | 112 'views_compositor%': '<(views_compositor)', |
| 101 'use_webkit_compositor%': '<(use_webkit_compositor)', | 113 'use_webkit_compositor%': '<(use_webkit_compositor)', |
| 102 'use_aura%': '<(use_aura)', | 114 'use_aura%': '<(use_aura)', |
| 103 'use_ash%': '<(use_ash)', | 115 'use_ash%': '<(use_ash)', |
| 104 'use_openssl%': '<(use_openssl)', | 116 'use_openssl%': '<(use_openssl)', |
| 105 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 117 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 106 'use_skia_on_mac%': '<(use_skia_on_mac)', | 118 'use_skia_on_mac%': '<(use_skia_on_mac)', |
| 107 | 119 |
| 108 # We used to provide a variable for changing how libraries were built. | 120 # We used to provide a variable for changing how libraries were built. |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 355 }], | 367 }], |
| 356 ], | 368 ], |
| 357 }, | 369 }, |
| 358 | 370 |
| 359 # Copy conditionally-set variables out one scope. | 371 # Copy conditionally-set variables out one scope. |
| 360 'branding%': '<(branding)', | 372 'branding%': '<(branding)', |
| 361 'buildtype%': '<(buildtype)', | 373 'buildtype%': '<(buildtype)', |
| 362 'target_arch%': '<(target_arch)', | 374 'target_arch%': '<(target_arch)', |
| 363 'host_arch%': '<(host_arch)', | 375 'host_arch%': '<(host_arch)', |
| 364 'library%': 'static_library', | 376 'library%': 'static_library', |
| 377 'show_about_flag_aura_window_mode%': '<(show_about_flag_aura_window_mode)', | |
| 365 'toolkit_views%': '<(toolkit_views)', | 378 'toolkit_views%': '<(toolkit_views)', |
| 366 'views_compositor%': '<(views_compositor)', | 379 'views_compositor%': '<(views_compositor)', |
| 367 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', | 380 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', |
| 368 'use_webkit_compositor%': '<(use_webkit_compositor)', | 381 'use_webkit_compositor%': '<(use_webkit_compositor)', |
| 369 'use_aura%': '<(use_aura)', | 382 'use_aura%': '<(use_aura)', |
| 370 'use_ash%': '<(use_ash)', | 383 'use_ash%': '<(use_ash)', |
| 371 'use_openssl%': '<(use_openssl)', | 384 'use_openssl%': '<(use_openssl)', |
| 372 'use_nss%': '<(use_nss)', | 385 'use_nss%': '<(use_nss)', |
| 373 'os_bsd%': '<(os_bsd)', | 386 'os_bsd%': '<(os_bsd)', |
| 374 'os_posix%': '<(os_posix)', | 387 'os_posix%': '<(os_posix)', |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 833 # consistency they should look for google_chrome_build like C++. | 846 # consistency they should look for google_chrome_build like C++. |
| 834 'grit_defines': ['-D', '_google_chrome', | 847 'grit_defines': ['-D', '_google_chrome', |
| 835 '-E', 'CHROMIUM_BUILD=google_chrome'], | 848 '-E', 'CHROMIUM_BUILD=google_chrome'], |
| 836 }, { | 849 }, { |
| 837 'grit_defines': ['-D', '_chromium', | 850 'grit_defines': ['-D', '_chromium', |
| 838 '-E', 'CHROMIUM_BUILD=chromium'], | 851 '-E', 'CHROMIUM_BUILD=chromium'], |
| 839 }], | 852 }], |
| 840 ['chromeos==1', { | 853 ['chromeos==1', { |
| 841 'grit_defines': ['-D', 'chromeos'], | 854 'grit_defines': ['-D', 'chromeos'], |
| 842 }], | 855 }], |
| 856 ['show_about_flag_aura_window_mode==1', { | |
| 857 'grit_defines': ['-D', 'show_about_flag_aura_window_mode'], | |
| 858 }], | |
| 843 ['toolkit_views==1', { | 859 ['toolkit_views==1', { |
| 844 'grit_defines': ['-D', 'toolkit_views'], | 860 'grit_defines': ['-D', 'toolkit_views'], |
| 845 }], | 861 }], |
| 846 ['use_aura==1', { | 862 ['use_aura==1', { |
| 847 'grit_defines': ['-D', 'use_aura'], | 863 'grit_defines': ['-D', 'use_aura'], |
| 848 }], | 864 }], |
| 849 ['use_ash==1', { | 865 ['use_ash==1', { |
| 850 'grit_defines': ['-D', 'use_ash'], | 866 'grit_defines': ['-D', 'use_ash'], |
| 851 }], | 867 }], |
| 852 ['use_nss==1', { | 868 ['use_nss==1', { |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1001 'defines': ['COMPONENT_BUILD'], | 1017 'defines': ['COMPONENT_BUILD'], |
| 1002 }], | 1018 }], |
| 1003 ['component=="shared_library" and incremental_chrome_dll==1', { | 1019 ['component=="shared_library" and incremental_chrome_dll==1', { |
| 1004 # TODO(dpranke): We can't incrementally link chrome when | 1020 # TODO(dpranke): We can't incrementally link chrome when |
| 1005 # content is being built as a DLL because chrome links in | 1021 # content is being built as a DLL because chrome links in |
| 1006 # webkit_glue and webkit_glue depends on symbols defined in | 1022 # webkit_glue and webkit_glue depends on symbols defined in |
| 1007 # content. We can remove this when we fix glue. | 1023 # content. We can remove this when we fix glue. |
| 1008 # See http://code.google.com/p/chromium/issues/detail?id=98755 . | 1024 # See http://code.google.com/p/chromium/issues/detail?id=98755 . |
| 1009 'defines': ['COMPILE_CONTENT_STATICALLY'], | 1025 'defines': ['COMPILE_CONTENT_STATICALLY'], |
| 1010 }], | 1026 }], |
| 1027 ['show_about_flag_aura_window_mode==1', { | |
| 1028 'defines': ['SHOW_ABOUT_FLAG_AURA_WINDOW_MODE=1'], | |
| 1029 }], | |
| 1011 ['toolkit_views==1', { | 1030 ['toolkit_views==1', { |
| 1012 'defines': ['TOOLKIT_VIEWS=1'], | 1031 'defines': ['TOOLKIT_VIEWS=1'], |
| 1013 }], | 1032 }], |
| 1014 ['views_compositor==1', { | 1033 ['views_compositor==1', { |
| 1015 'defines': ['VIEWS_COMPOSITOR=1'], | 1034 'defines': ['VIEWS_COMPOSITOR=1'], |
| 1016 }], | 1035 }], |
| 1017 ['ui_compositor_image_transport==1', { | 1036 ['ui_compositor_image_transport==1', { |
| 1018 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], | 1037 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], |
| 1019 }], | 1038 }], |
| 1020 ['use_webkit_compositor==1', { | 1039 ['use_webkit_compositor==1', { |
| (...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2780 # settings in target dicts. SYMROOT is a special case, because many other | 2799 # settings in target dicts. SYMROOT is a special case, because many other |
| 2781 # Xcode variables depend on it, including variables such as | 2800 # Xcode variables depend on it, including variables such as |
| 2782 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2801 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2802 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2784 # files to appear (when present) in the UI as actual files and not red | 2803 # files to appear (when present) in the UI as actual files and not red |
| 2785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2804 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2786 # and therefore SYMROOT, needs to be set at the project level. | 2805 # and therefore SYMROOT, needs to be set at the project level. |
| 2787 'SYMROOT': '<(DEPTH)/xcodebuild', | 2806 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2788 }, | 2807 }, |
| 2789 } | 2808 } |
| OLD | NEW |