| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 'use_openssl%': 0, | 44 'use_openssl%': 0, |
| 45 }, | 45 }, |
| 46 # Copy conditionally-set variables out one scope. | 46 # Copy conditionally-set variables out one scope. |
| 47 'chromeos%': '<(chromeos)', | 47 'chromeos%': '<(chromeos)', |
| 48 'use_only_pure_views%': '<(use_only_pure_views)', | 48 'use_only_pure_views%': '<(use_only_pure_views)', |
| 49 'touchui%': '<(touchui)', | 49 'touchui%': '<(touchui)', |
| 50 'views_compositor%': '<(views_compositor)', | 50 'views_compositor%': '<(views_compositor)', |
| 51 'use_aura%': '<(use_aura)', | 51 'use_aura%': '<(use_aura)', |
| 52 'use_openssl%': '<(use_openssl)', | 52 'use_openssl%': '<(use_openssl)', |
| 53 | 53 |
| 54 # WebKit compositor for ui |
| 55 'use_webkit_compositor%': 0, |
| 56 |
| 54 # Compute the architecture that we're building on. | 57 # Compute the architecture that we're building on. |
| 55 'conditions': [ | 58 'conditions': [ |
| 56 [ 'OS=="win" or OS=="mac"', { | 59 [ 'OS=="win" or OS=="mac"', { |
| 57 'host_arch%': 'ia32', | 60 'host_arch%': 'ia32', |
| 58 }, { | 61 }, { |
| 59 # This handles the Unix platforms for which there is some support. | 62 # This handles the Unix platforms for which there is some support. |
| 60 # Anything else gets passed through, which probably won't work very | 63 # Anything else gets passed through, which probably won't work very |
| 61 # well; such hosts should pass an explicit target_arch to gyp. | 64 # well; such hosts should pass an explicit target_arch to gyp. |
| 62 'host_arch%': | 65 'host_arch%': |
| 63 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a
rm.*/arm/;s/i86pc/ia32/")', | 66 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a
rm.*/arm/;s/i86pc/ia32/")', |
| (...skipping 30 matching lines...) Expand all Loading... |
| 94 }, | 97 }, |
| 95 | 98 |
| 96 # Copy conditionally-set variables out one scope. | 99 # Copy conditionally-set variables out one scope. |
| 97 'chromeos%': '<(chromeos)', | 100 'chromeos%': '<(chromeos)', |
| 98 'touchui%': '<(touchui)', | 101 'touchui%': '<(touchui)', |
| 99 'use_virtual_keyboard%': '<(use_virtual_keyboard)', | 102 'use_virtual_keyboard%': '<(use_virtual_keyboard)', |
| 100 'host_arch%': '<(host_arch)', | 103 'host_arch%': '<(host_arch)', |
| 101 'toolkit_views%': '<(toolkit_views)', | 104 'toolkit_views%': '<(toolkit_views)', |
| 102 'use_only_pure_views%': '<(use_only_pure_views)', | 105 'use_only_pure_views%': '<(use_only_pure_views)', |
| 103 'views_compositor%': '<(views_compositor)', | 106 'views_compositor%': '<(views_compositor)', |
| 107 'use_webkit_compositor%': '<(use_webkit_compositor)', |
| 104 'use_aura%': '<(use_aura)', | 108 'use_aura%': '<(use_aura)', |
| 105 'use_openssl%': '<(use_openssl)', | 109 'use_openssl%': '<(use_openssl)', |
| 106 | 110 |
| 107 # We used to provide a variable for changing how libraries were built. | 111 # We used to provide a variable for changing how libraries were built. |
| 108 # This variable remains until we can clean up all the users. | 112 # This variable remains until we can clean up all the users. |
| 109 # This needs to be one nested variables dict in so that dependent | 113 # This needs to be one nested variables dict in so that dependent |
| 110 # gyp files can make use of it in their outer variables. (Yikes!) | 114 # gyp files can make use of it in their outer variables. (Yikes!) |
| 111 # http://code.google.com/p/chromium/issues/detail?id=83308 | 115 # http://code.google.com/p/chromium/issues/detail?id=83308 |
| 112 'library%': 'static_library', | 116 'library%': 'static_library', |
| 113 | 117 |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 'webui_task_manager%': 1, | 328 'webui_task_manager%': 1, |
| 325 }], | 329 }], |
| 326 | 330 |
| 327 ['OS=="android"', { | 331 ['OS=="android"', { |
| 328 'proprietary_codecs%': 1, | 332 'proprietary_codecs%': 1, |
| 329 'enable_webrtc%': 0, | 333 'enable_webrtc%': 0, |
| 330 }], | 334 }], |
| 331 | 335 |
| 332 # Use GPU accelerated cross process image transport by default | 336 # Use GPU accelerated cross process image transport by default |
| 333 # on TOUCH_UI and linux builds with the Aura window manager | 337 # on TOUCH_UI and linux builds with the Aura window manager |
| 334 ['views_compositor==1 and OS=="linux"', { | 338 ['views_compositor==1 and OS=="linux" and use_webkit_compositor!=1', { |
| 335 'ui_compositor_image_transport%': 1, | 339 'ui_compositor_image_transport%': 1, |
| 336 }, { | 340 }, { |
| 337 'ui_compositor_image_transport%': 0, | 341 'ui_compositor_image_transport%': 0, |
| 338 }], | 342 }], |
| 339 ], | 343 ], |
| 340 }, | 344 }, |
| 341 | 345 |
| 342 # Copy conditionally-set variables out one scope. | 346 # Copy conditionally-set variables out one scope. |
| 343 'branding%': '<(branding)', | 347 'branding%': '<(branding)', |
| 344 'buildtype%': '<(buildtype)', | 348 'buildtype%': '<(buildtype)', |
| 345 'target_arch%': '<(target_arch)', | 349 'target_arch%': '<(target_arch)', |
| 346 'host_arch%': '<(host_arch)', | 350 'host_arch%': '<(host_arch)', |
| 347 'library%': 'static_library', | 351 'library%': 'static_library', |
| 348 'toolkit_views%': '<(toolkit_views)', | 352 'toolkit_views%': '<(toolkit_views)', |
| 349 'use_only_pure_views%': '<(use_only_pure_views)', | 353 'use_only_pure_views%': '<(use_only_pure_views)', |
| 350 'views_compositor%': '<(views_compositor)', | 354 'views_compositor%': '<(views_compositor)', |
| 351 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', | 355 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', |
| 356 'use_webkit_compositor%': '<(use_webkit_compositor)', |
| 352 'use_aura%': '<(use_aura)', | 357 'use_aura%': '<(use_aura)', |
| 353 'use_openssl%': '<(use_openssl)', | 358 'use_openssl%': '<(use_openssl)', |
| 354 'use_nss%': '<(use_nss)', | 359 'use_nss%': '<(use_nss)', |
| 355 'os_posix%': '<(os_posix)', | 360 'os_posix%': '<(os_posix)', |
| 356 'use_glib%': '<(use_glib)', | 361 'use_glib%': '<(use_glib)', |
| 357 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 362 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 358 'use_skia%': '<(use_skia)', | 363 'use_skia%': '<(use_skia)', |
| 359 'use_x11%': '<(use_x11)', | 364 'use_x11%': '<(use_x11)', |
| 360 'use_gnome_keyring%': '<(use_gnome_keyring)', | 365 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 361 'linux_fpic%': '<(linux_fpic)', | 366 'linux_fpic%': '<(linux_fpic)', |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 }], | 952 }], |
| 948 ['use_only_pure_views==1', { | 953 ['use_only_pure_views==1', { |
| 949 'defines': ['USE_ONLY_PURE_VIEWS=1'], | 954 'defines': ['USE_ONLY_PURE_VIEWS=1'], |
| 950 }], | 955 }], |
| 951 ['views_compositor==1', { | 956 ['views_compositor==1', { |
| 952 'defines': ['VIEWS_COMPOSITOR=1'], | 957 'defines': ['VIEWS_COMPOSITOR=1'], |
| 953 }], | 958 }], |
| 954 ['ui_compositor_image_transport==1', { | 959 ['ui_compositor_image_transport==1', { |
| 955 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], | 960 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], |
| 956 }], | 961 }], |
| 962 ['use_webkit_compositor==1', { |
| 963 'defines': ['USE_WEBKIT_COMPOSITOR=1'], |
| 964 }], |
| 957 ['use_aura==1', { | 965 ['use_aura==1', { |
| 958 'defines': ['USE_AURA=1'], | 966 'defines': ['USE_AURA=1'], |
| 959 }], | 967 }], |
| 960 ['use_nss==1', { | 968 ['use_nss==1', { |
| 961 'defines': ['USE_NSS=1'], | 969 'defines': ['USE_NSS=1'], |
| 962 }], | 970 }], |
| 963 ['toolkit_uses_gtk==1', { | 971 ['toolkit_uses_gtk==1', { |
| 964 'defines': ['TOOLKIT_USES_GTK=1'], | 972 'defines': ['TOOLKIT_USES_GTK=1'], |
| 965 }], | 973 }], |
| 966 ['chromeos==1', { | 974 ['chromeos==1', { |
| (...skipping 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2567 # settings in target dicts. SYMROOT is a special case, because many other | 2575 # settings in target dicts. SYMROOT is a special case, because many other |
| 2568 # Xcode variables depend on it, including variables such as | 2576 # Xcode variables depend on it, including variables such as |
| 2569 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2577 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2570 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2578 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2571 # files to appear (when present) in the UI as actual files and not red | 2579 # files to appear (when present) in the UI as actual files and not red |
| 2572 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2580 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2573 # and therefore SYMROOT, needs to be set at the project level. | 2581 # and therefore SYMROOT, needs to be set at the project level. |
| 2574 'SYMROOT': '<(DEPTH)/xcodebuild', | 2582 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2575 }, | 2583 }, |
| 2576 } | 2584 } |
| OLD | NEW |