Fold views_compositor=1 into use_aura=1

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
   'variables': {
     # Putting a variables dict inside another variables dict looks kind of
     # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
     # variables within the outer variables dict here.  This is necessary
     # to get these variables defined for the conditions within this variables
     # dict that operate on these variables (e.g., for setting 'toolkit_views',
     # we need to have 'chromeos' already set).
     'variables': {
       'variables': {
         'includes': [
           'use_skia_on_mac.gypi',
         ],
         'variables': {
           # Whether we're building a ChromeOS build.
           'chromeos%': 0,
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 0,
 
-          # Whether the compositor is enabled on views.
-          'views_compositor%': 0,
-
           # Whether or not we are using the Aura windowing framework.
           'use_aura%': 0,
 
           # Whether or not we are building the Ash shell.
           'use_ash%': 0,
 
           # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
           'use_openssl%': 0,
 
           # Disable Virtual keyboard support by default.
           'use_virtual_keyboard%': 0,
 
           # Default setting for use_skia on mac platform.
           # This is typically overridden in use_skia_on_mac.gypi.
           'use_skia_on_mac%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
-        'views_compositor%': '<(views_compositor)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
         'use_openssl%': '<(use_openssl)',
         'use_virtual_keyboard%': '<(use_virtual_keyboard)',
         'use_skia_on_mac%': '<(use_skia_on_mac)',
 
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
             'host_arch%': 'ia32',
           }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
           # Ash requires Aura.
           ['use_ash==1', {
             'use_aura%': 1,
           }],
 
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
-
-          # Use the views compositor when using the Aura window manager.
-          ['use_aura==1', {
-            'views_compositor%': 1,
-          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
-      'views_compositor%': '<(views_compositor)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_openssl%': '<(use_openssl)',
       'use_virtual_keyboard%': '<(use_virtual_keyboard)',
       'use_skia_on_mac%': '<(use_skia_on_mac)',
 
       # We used to provide a variable for changing how libraries were built.
       # This variable remains until we can clean up all the users.
       # This needs to be one nested variables dict in so that dependent
       # gyp files can make use of it in their outer variables.  (Yikes!)
@@ skipping 265 matching lines @@
           'webui_task_manager%': 1,
         }],
 
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
         # on linux builds with the Aura window manager
-        ['views_compositor==1 and OS=="linux"', {
+        ['use_aura==1 and OS=="linux"', {
           'ui_compositor_image_transport%': 1,
         }, {
           'ui_compositor_image_transport%': 0,
         }],
 
         # Turn precompiled headers on by default for VS 2010.
         ['OS=="win" and MSVS_VERSION=="2010"', {
           'chromium_win_pch%': 1
         }],
 
         ['use_aura==1 or chromeos==1', {
           'enable_plugin_installation%': 0,
         }, {
           'enable_plugin_installation%': 1,
         }],
       ],
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
-    'views_compositor%': '<(views_compositor)',
     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
     'use_webkit_compositor%': '<(use_webkit_compositor)',
     'use_aura%': '<(use_aura)',
     'use_ash%': '<(use_ash)',
     'use_openssl%': '<(use_openssl)',
     'use_nss%': '<(use_nss)',
     'os_bsd%': '<(os_bsd)',
     'os_posix%': '<(os_posix)',
     'use_glib%': '<(use_glib)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ skipping 621 matching lines @@
         # TODO(dpranke): We can't incrementally link chrome when
         # content is being built as a DLL because chrome links in
         # webkit_glue and webkit_glue depends on symbols defined in
         # content. We can remove this when we fix glue.
         # See http://code.google.com/p/chromium/issues/detail?id=98755 .
         'defines': ['COMPILE_CONTENT_STATICALLY'],
       }],
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
-      ['views_compositor==1', {
-        'defines': ['VIEWS_COMPOSITOR=1'],
-      }],
       ['ui_compositor_image_transport==1', {
         'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
       }],
       ['use_webkit_compositor==1', {
         'defines': ['USE_WEBKIT_COMPOSITOR=1'],
       }],
       ['use_aura==1', {
         'defines': ['USE_AURA=1'],
       }],
       ['use_ash==1', {
@@ skipping 1688 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }