Remove use_skia_on_mac.gypi ; building with CG is no longer supported.

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're building pre-Aura ChromeOS (using GTK).
           'chromeos_gtk%': 0,
 
           # Whether we are using Views Toolkit
           'toolkit_views%': 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,
 
           # Disable viewport meta tag by default.
           'enable_viewport%': 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)',
         'chromeos_gtk%': '<(chromeos_gtk)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
         'use_openssl%': '<(use_openssl)',
         'use_virtual_keyboard%': '<(use_virtual_keyboard)',
         'enable_viewport%': '<(enable_viewport)',
-        '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%':
@@ skipping 31 matching lines @@
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'chromeos_gtk%': '<(chromeos_gtk)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_openssl%': '<(use_openssl)',
       'use_virtual_keyboard%': '<(use_virtual_keyboard)',
       'enable_viewport%': '<(enable_viewport)',
-      '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!)
       # http://code.google.com/p/chromium/issues/detail?id=83308
       'library%': 'static_library',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
@@ skipping 173 matching lines @@
       # always calls tools/isolate/isolate.py. See the script's --help for more
       # information and the valid --mode values. Meant to be overriden with
       # GYP_DEFINES.
       'tests_run%': 'check',
 
       'conditions': [
         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
         # the 'conditions' clause.  Initial attempts resulted in chromium and
         # webkit disagreeing on its setting.
         ['OS=="mac"', {
-          'use_skia%': '<(use_skia_on_mac)',
+          'use_skia%': 1,

[_cary, 2012/03/14 15:59:25]

Does the TODO above mean also that use_skia can't be moved outside of the
OS=='mac' clause?

[epoger, 2012/03/14 16:01:35]

Yup, for now at least.  My intent is to kill use_skia_on_mac first of all, and
then kill use_skia entirely in a separate CL.

           # Mac uses clang by default, so turn on the plugin as well.
           'clang_use_chrome_plugins%': 1,
         }, {
           'use_skia%': 1,
         }],
 
         # A flag for POSIX platforms
         ['OS=="win"', {
           'os_posix%': 0,
         }, {
@@ skipping 139 matching lines @@
     'use_skia%': '<(use_skia)',
     'use_x11%': '<(use_x11)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'enable_pepper_threading%': '<(enable_pepper_threading)',
     'chromeos%': '<(chromeos)',
     'chromeos_gtk%': '<(chromeos_gtk)',
     'use_virtual_keyboard%': '<(use_virtual_keyboard)',
     'enable_viewport%': '<(enable_viewport)',
-    'use_skia_on_mac%': '<(use_skia_on_mac)',
     'use_xi2_mt%':'<(use_xi2_mt)',
     'file_manager_extension%': '<(file_manager_extension)',
     'webui_task_manager%': '<(webui_task_manager)',
     'inside_chromium_build%': '<(inside_chromium_build)',
     'fastbuild%': '<(fastbuild)',
     'dcheck_always_on%': '<(dcheck_always_on)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
     'arm_neon%': '<(arm_neon)',
     'sysroot%': '<(sysroot)',
@@ skipping 2427 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',
   },
 }