| 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { | 320 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { |
| 321 'webui_task_manager%': 1, | 321 'webui_task_manager%': 1, |
| 322 }, { | 322 }, { |
| 323 'webui_task_manager%': 0, | 323 'webui_task_manager%': 0, |
| 324 }], | 324 }], |
| 325 | 325 |
| 326 ['OS=="android"', { | 326 ['OS=="android"', { |
| 327 'proprietary_codecs%': 1, | 327 'proprietary_codecs%': 1, |
| 328 'enable_webrtc%': 0, | 328 'enable_webrtc%': 0, |
| 329 }], | 329 }], |
| 330 |
| 331 # Use GPU accelerated cross process image transport by default |
| 332 # on TOUCH_UI and linux builds with the Aura window manager |
| 333 ['views_compositor==1 and OS=="linux"', { |
| 334 'views_gpu_image_transport%': 1, |
| 335 }, { |
| 336 'views_gpu_image_transport%': 0, |
| 337 }], |
| 330 ], | 338 ], |
| 331 }, | 339 }, |
| 332 | 340 |
| 333 # Copy conditionally-set variables out one scope. | 341 # Copy conditionally-set variables out one scope. |
| 334 'branding%': '<(branding)', | 342 'branding%': '<(branding)', |
| 335 'buildtype%': '<(buildtype)', | 343 'buildtype%': '<(buildtype)', |
| 336 'target_arch%': '<(target_arch)', | 344 'target_arch%': '<(target_arch)', |
| 337 'host_arch%': '<(host_arch)', | 345 'host_arch%': '<(host_arch)', |
| 338 'library%': 'static_library', | 346 'library%': 'static_library', |
| 339 'toolkit_views%': '<(toolkit_views)', | 347 'toolkit_views%': '<(toolkit_views)', |
| 340 'use_only_pure_views%': '<(use_only_pure_views)', | 348 'use_only_pure_views%': '<(use_only_pure_views)', |
| 341 'views_compositor%': '<(views_compositor)', | 349 'views_compositor%': '<(views_compositor)', |
| 350 'views_gpu_image_transport%': '<(views_gpu_image_transport)', |
| 342 'use_aura%': '<(use_aura)', | 351 'use_aura%': '<(use_aura)', |
| 343 'use_openssl%': '<(use_openssl)', | 352 'use_openssl%': '<(use_openssl)', |
| 344 'use_nss%': '<(use_nss)', | 353 'use_nss%': '<(use_nss)', |
| 345 'os_posix%': '<(os_posix)', | 354 'os_posix%': '<(os_posix)', |
| 346 'use_glib%': '<(use_glib)', | 355 'use_glib%': '<(use_glib)', |
| 347 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 356 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 348 'use_skia%': '<(use_skia)', | 357 'use_skia%': '<(use_skia)', |
| 349 'use_x11%': '<(use_x11)', | 358 'use_x11%': '<(use_x11)', |
| 350 'use_gnome_keyring%': '<(use_gnome_keyring)', | 359 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 351 'linux_fpic%': '<(linux_fpic)', | 360 'linux_fpic%': '<(linux_fpic)', |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 }], | 939 }], |
| 931 ['toolkit_views==1', { | 940 ['toolkit_views==1', { |
| 932 'defines': ['TOOLKIT_VIEWS=1'], | 941 'defines': ['TOOLKIT_VIEWS=1'], |
| 933 }], | 942 }], |
| 934 ['use_only_pure_views==1', { | 943 ['use_only_pure_views==1', { |
| 935 'defines': ['USE_ONLY_PURE_VIEWS=1'], | 944 'defines': ['USE_ONLY_PURE_VIEWS=1'], |
| 936 }], | 945 }], |
| 937 ['views_compositor==1', { | 946 ['views_compositor==1', { |
| 938 'defines': ['VIEWS_COMPOSITOR=1'], | 947 'defines': ['VIEWS_COMPOSITOR=1'], |
| 939 }], | 948 }], |
| 949 ['views_gpu_image_transport==1', { |
| 950 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], |
| 951 }], |
| 940 ['use_aura==1', { | 952 ['use_aura==1', { |
| 941 'defines': ['USE_AURA=1'], | 953 'defines': ['USE_AURA=1'], |
| 942 }], | 954 }], |
| 943 ['use_nss==1', { | 955 ['use_nss==1', { |
| 944 'defines': ['USE_NSS=1'], | 956 'defines': ['USE_NSS=1'], |
| 945 }], | 957 }], |
| 946 ['toolkit_uses_gtk==1', { | 958 ['toolkit_uses_gtk==1', { |
| 947 'defines': ['TOOLKIT_USES_GTK=1'], | 959 'defines': ['TOOLKIT_USES_GTK=1'], |
| 948 }], | 960 }], |
| 949 ['chromeos==1', { | 961 ['chromeos==1', { |
| (...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2536 # settings in target dicts. SYMROOT is a special case, because many other | 2548 # settings in target dicts. SYMROOT is a special case, because many other |
| 2537 # Xcode variables depend on it, including variables such as | 2549 # Xcode variables depend on it, including variables such as |
| 2538 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2550 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2539 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2551 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2540 # files to appear (when present) in the UI as actual files and not red | 2552 # files to appear (when present) in the UI as actual files and not red |
| 2541 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2553 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2542 # and therefore SYMROOT, needs to be set at the project level. | 2554 # and therefore SYMROOT, needs to be set at the project level. |
| 2543 'SYMROOT': '<(DEPTH)/xcodebuild', | 2555 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2544 }, | 2556 }, |
| 2545 } | 2557 } |
| OLD | NEW |