| 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 }], | 325 }], |
| 326 | 326 |
| 327 ['OS=="android"', { | 327 ['OS=="android"', { |
| 328 'proprietary_codecs%': 1, | 328 'proprietary_codecs%': 1, |
| 329 'enable_webrtc%': 0, | 329 'enable_webrtc%': 0, |
| 330 }], | 330 }], |
| 331 | 331 |
| 332 # Use GPU accelerated cross process image transport by default | 332 # Use GPU accelerated cross process image transport by default |
| 333 # on TOUCH_UI and linux builds with the Aura window manager | 333 # on TOUCH_UI and linux builds with the Aura window manager |
| 334 ['views_compositor==1 and OS=="linux"', { | 334 ['views_compositor==1 and OS=="linux"', { |
| 335 'views_gpu_image_transport%': 1, | 335 'ui_compositor_image_transport%': 1, |
| 336 }, { | 336 }, { |
| 337 'views_gpu_image_transport%': 0, | 337 'ui_compositor_image_transport%': 0, |
| 338 }], | 338 }], |
| 339 ], | 339 ], |
| 340 }, | 340 }, |
| 341 | 341 |
| 342 # Copy conditionally-set variables out one scope. | 342 # Copy conditionally-set variables out one scope. |
| 343 'branding%': '<(branding)', | 343 'branding%': '<(branding)', |
| 344 'buildtype%': '<(buildtype)', | 344 'buildtype%': '<(buildtype)', |
| 345 'target_arch%': '<(target_arch)', | 345 'target_arch%': '<(target_arch)', |
| 346 'host_arch%': '<(host_arch)', | 346 'host_arch%': '<(host_arch)', |
| 347 'library%': 'static_library', | 347 'library%': 'static_library', |
| 348 'toolkit_views%': '<(toolkit_views)', | 348 'toolkit_views%': '<(toolkit_views)', |
| 349 'use_only_pure_views%': '<(use_only_pure_views)', | 349 'use_only_pure_views%': '<(use_only_pure_views)', |
| 350 'views_compositor%': '<(views_compositor)', | 350 'views_compositor%': '<(views_compositor)', |
| 351 'views_gpu_image_transport%': '<(views_gpu_image_transport)', | 351 'ui_compositor_image_transport%': '<(views_gpu_image_transport)', |
| 352 'use_aura%': '<(use_aura)', | 352 'use_aura%': '<(use_aura)', |
| 353 'use_openssl%': '<(use_openssl)', | 353 'use_openssl%': '<(use_openssl)', |
| 354 'use_nss%': '<(use_nss)', | 354 'use_nss%': '<(use_nss)', |
| 355 'os_posix%': '<(os_posix)', | 355 'os_posix%': '<(os_posix)', |
| 356 'use_glib%': '<(use_glib)', | 356 'use_glib%': '<(use_glib)', |
| 357 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 357 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 358 'use_skia%': '<(use_skia)', | 358 'use_skia%': '<(use_skia)', |
| 359 'use_x11%': '<(use_x11)', | 359 'use_x11%': '<(use_x11)', |
| 360 'use_gnome_keyring%': '<(use_gnome_keyring)', | 360 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 361 'linux_fpic%': '<(linux_fpic)', | 361 'linux_fpic%': '<(linux_fpic)', |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 }], | 942 }], |
| 943 ['toolkit_views==1', { | 943 ['toolkit_views==1', { |
| 944 'defines': ['TOOLKIT_VIEWS=1'], | 944 'defines': ['TOOLKIT_VIEWS=1'], |
| 945 }], | 945 }], |
| 946 ['use_only_pure_views==1', { | 946 ['use_only_pure_views==1', { |
| 947 'defines': ['USE_ONLY_PURE_VIEWS=1'], | 947 'defines': ['USE_ONLY_PURE_VIEWS=1'], |
| 948 }], | 948 }], |
| 949 ['views_compositor==1', { | 949 ['views_compositor==1', { |
| 950 'defines': ['VIEWS_COMPOSITOR=1'], | 950 'defines': ['VIEWS_COMPOSITOR=1'], |
| 951 }], | 951 }], |
| 952 ['views_gpu_image_transport==1', { | 952 ['ui_compositor_image_transport==1', { |
| 953 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], | 953 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], |
| 954 }], | 954 }], |
| 955 ['use_aura==1', { | 955 ['use_aura==1', { |
| 956 'defines': ['USE_AURA=1'], | 956 'defines': ['USE_AURA=1'], |
| 957 }], | 957 }], |
| 958 ['use_nss==1', { | 958 ['use_nss==1', { |
| 959 'defines': ['USE_NSS=1'], | 959 'defines': ['USE_NSS=1'], |
| 960 }], | 960 }], |
| 961 ['toolkit_uses_gtk==1', { | 961 ['toolkit_uses_gtk==1', { |
| 962 'defines': ['TOOLKIT_USES_GTK=1'], | 962 'defines': ['TOOLKIT_USES_GTK=1'], |
| (...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2565 # settings in target dicts. SYMROOT is a special case, because many other | 2565 # settings in target dicts. SYMROOT is a special case, because many other |
| 2566 # Xcode variables depend on it, including variables such as | 2566 # Xcode variables depend on it, including variables such as |
| 2567 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2567 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2568 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2568 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2569 # files to appear (when present) in the UI as actual files and not red | 2569 # files to appear (when present) in the UI as actual files and not red |
| 2570 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2570 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2571 # and therefore SYMROOT, needs to be set at the project level. | 2571 # and therefore SYMROOT, needs to be set at the project level. |
| 2572 'SYMROOT': '<(DEPTH)/xcodebuild', | 2572 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2573 }, | 2573 }, |
| 2574 } | 2574 } |
| OLD | NEW |