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 'enable_viewport%': 0, | |
|
darin (slow to review)
2012/01/12 19:18:02
I may not be the best reviewer for this change. I
| |
| 48 }, | 50 }, |
| 49 # Copy conditionally-set variables out one scope. | 51 # Copy conditionally-set variables out one scope. |
| 50 'chromeos%': '<(chromeos)', | 52 'chromeos%': '<(chromeos)', |
| 51 'views_compositor%': '<(views_compositor)', | 53 'views_compositor%': '<(views_compositor)', |
| 52 'use_aura%': '<(use_aura)', | 54 'use_aura%': '<(use_aura)', |
| 53 'use_ash%': '<(use_ash)', | 55 'use_ash%': '<(use_ash)', |
| 54 'use_openssl%': '<(use_openssl)', | 56 'use_openssl%': '<(use_openssl)', |
| 55 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 57 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 56 'use_skia_on_mac%': '<(use_skia_on_mac)', | 58 'use_skia_on_mac%': '<(use_skia_on_mac)', |
| 59 'enable_viewport%': '<(enable_viewport)', | |
| 57 | 60 |
| 58 # Compute the architecture that we're building on. | 61 # Compute the architecture that we're building on. |
| 59 'conditions': [ | 62 'conditions': [ |
| 60 [ 'OS=="win" or OS=="mac"', { | 63 [ 'OS=="win" or OS=="mac"', { |
| 61 'host_arch%': 'ia32', | 64 'host_arch%': 'ia32', |
| 62 }, { | 65 }, { |
| 63 # This handles the Unix platforms for which there is some support. | 66 # This handles the Unix platforms for which there is some support. |
| 64 # Anything else gets passed through, which probably won't work very | 67 # Anything else gets passed through, which probably won't work very |
| 65 # well; such hosts should pass an explicit target_arch to gyp. | 68 # well; such hosts should pass an explicit target_arch to gyp. |
| 66 'host_arch%': | 69 'host_arch%': |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 96 # Copy conditionally-set variables out one scope. | 99 # Copy conditionally-set variables out one scope. |
| 97 'chromeos%': '<(chromeos)', | 100 'chromeos%': '<(chromeos)', |
| 98 'host_arch%': '<(host_arch)', | 101 'host_arch%': '<(host_arch)', |
| 99 'toolkit_views%': '<(toolkit_views)', | 102 'toolkit_views%': '<(toolkit_views)', |
| 100 'views_compositor%': '<(views_compositor)', | 103 'views_compositor%': '<(views_compositor)', |
| 101 'use_webkit_compositor%': '<(use_webkit_compositor)', | 104 'use_webkit_compositor%': '<(use_webkit_compositor)', |
| 102 'use_aura%': '<(use_aura)', | 105 'use_aura%': '<(use_aura)', |
| 103 'use_ash%': '<(use_ash)', | 106 'use_ash%': '<(use_ash)', |
| 104 'use_openssl%': '<(use_openssl)', | 107 'use_openssl%': '<(use_openssl)', |
| 105 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 108 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 109 'enable_viewport%': '<(enable_viewport)', | |
| 106 'use_skia_on_mac%': '<(use_skia_on_mac)', | 110 'use_skia_on_mac%': '<(use_skia_on_mac)', |
| 107 | 111 |
| 108 # We used to provide a variable for changing how libraries were built. | 112 # We used to provide a variable for changing how libraries were built. |
| 109 # This variable remains until we can clean up all the users. | 113 # This variable remains until we can clean up all the users. |
| 110 # This needs to be one nested variables dict in so that dependent | 114 # This needs to be one nested variables dict in so that dependent |
| 111 # gyp files can make use of it in their outer variables. (Yikes!) | 115 # gyp files can make use of it in their outer variables. (Yikes!) |
| 112 # http://code.google.com/p/chromium/issues/detail?id=83308 | 116 # http://code.google.com/p/chromium/issues/detail?id=83308 |
| 113 'library%': 'static_library', | 117 'library%': 'static_library', |
| 114 | 118 |
| 115 # Override branding to select the desired branding flavor. | 119 # Override branding to select the desired branding flavor. |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 375 'use_glib%': '<(use_glib)', | 379 'use_glib%': '<(use_glib)', |
| 376 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 380 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 377 'use_skia%': '<(use_skia)', | 381 'use_skia%': '<(use_skia)', |
| 378 'use_x11%': '<(use_x11)', | 382 'use_x11%': '<(use_x11)', |
| 379 'use_gnome_keyring%': '<(use_gnome_keyring)', | 383 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 380 'linux_fpic%': '<(linux_fpic)', | 384 'linux_fpic%': '<(linux_fpic)', |
| 381 'enable_flapper_hacks%': '<(enable_flapper_hacks)', | 385 'enable_flapper_hacks%': '<(enable_flapper_hacks)', |
| 382 'enable_pepper_threading%': '<(enable_pepper_threading)', | 386 'enable_pepper_threading%': '<(enable_pepper_threading)', |
| 383 'chromeos%': '<(chromeos)', | 387 'chromeos%': '<(chromeos)', |
| 384 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 388 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 389 'enable_viewport%': '<(enable_viewport)', | |
| 385 'use_skia_on_mac%': '<(use_skia_on_mac)', | 390 'use_skia_on_mac%': '<(use_skia_on_mac)', |
| 386 'use_xi2_mt%':'<(use_xi2_mt)', | 391 'use_xi2_mt%':'<(use_xi2_mt)', |
| 387 'file_manager_extension%': '<(file_manager_extension)', | 392 'file_manager_extension%': '<(file_manager_extension)', |
| 388 'webui_task_manager%': '<(webui_task_manager)', | 393 'webui_task_manager%': '<(webui_task_manager)', |
| 389 'inside_chromium_build%': '<(inside_chromium_build)', | 394 'inside_chromium_build%': '<(inside_chromium_build)', |
| 390 'fastbuild%': '<(fastbuild)', | 395 'fastbuild%': '<(fastbuild)', |
| 391 'dcheck_always_on%': '<(dcheck_always_on)', | 396 'dcheck_always_on%': '<(dcheck_always_on)', |
| 392 'python_ver%': '<(python_ver)', | 397 'python_ver%': '<(python_ver)', |
| 393 'armv7%': '<(armv7)', | 398 'armv7%': '<(armv7)', |
| 394 'arm_neon%': '<(arm_neon)', | 399 'arm_neon%': '<(arm_neon)', |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1071 }], | 1076 }], |
| 1072 ['proprietary_codecs==1', { | 1077 ['proprietary_codecs==1', { |
| 1073 'defines': ['USE_PROPRIETARY_CODECS'], | 1078 'defines': ['USE_PROPRIETARY_CODECS'], |
| 1074 }], | 1079 }], |
| 1075 ['enable_flapper_hacks==1', { | 1080 ['enable_flapper_hacks==1', { |
| 1076 'defines': ['ENABLE_FLAPPER_HACKS=1'], | 1081 'defines': ['ENABLE_FLAPPER_HACKS=1'], |
| 1077 }], | 1082 }], |
| 1078 ['enable_pepper_threading==1', { | 1083 ['enable_pepper_threading==1', { |
| 1079 'defines': ['ENABLE_PEPPER_THREADING'], | 1084 'defines': ['ENABLE_PEPPER_THREADING'], |
| 1080 }], | 1085 }], |
| 1086 ['enable_viewport==1', { | |
| 1087 'defines': ['ENABLE_VIEWPORT'], | |
| 1088 }], | |
| 1081 ['configuration_policy==1', { | 1089 ['configuration_policy==1', { |
| 1082 'defines': ['ENABLE_CONFIGURATION_POLICY'], | 1090 'defines': ['ENABLE_CONFIGURATION_POLICY'], |
| 1083 }], | 1091 }], |
| 1084 ['input_speech==1', { | 1092 ['input_speech==1', { |
| 1085 'defines': ['ENABLE_INPUT_SPEECH'], | 1093 'defines': ['ENABLE_INPUT_SPEECH'], |
| 1086 }], | 1094 }], |
| 1087 ['notifications==1', { | 1095 ['notifications==1', { |
| 1088 'defines': ['ENABLE_NOTIFICATIONS'], | 1096 'defines': ['ENABLE_NOTIFICATIONS'], |
| 1089 }], | 1097 }], |
| 1090 ['fastbuild!=0', { | 1098 ['fastbuild!=0', { |
| (...skipping 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2780 # settings in target dicts. SYMROOT is a special case, because many other | 2788 # settings in target dicts. SYMROOT is a special case, because many other |
| 2781 # Xcode variables depend on it, including variables such as | 2789 # Xcode variables depend on it, including variables such as |
| 2782 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2790 # 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 | 2791 # 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 | 2792 # 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, | 2793 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2786 # and therefore SYMROOT, needs to be set at the project level. | 2794 # and therefore SYMROOT, needs to be set at the project level. |
| 2787 'SYMROOT': '<(DEPTH)/xcodebuild', | 2795 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2788 }, | 2796 }, |
| 2789 } | 2797 } |
| OLD | NEW |