Revert "Factor out xcode c/cpp settings into variables to apply to cmake builds."

gyp/common_conditions.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
@@ skipping 458 matching lines @@
           }],
           [ 'skia_keep_frame_pointer', {
             'cflags': [ '-fno-omit-frame-pointer' ],
           }],
         ],
       },
     ],
 
     [ 'skia_os == "mac"',
       {
-        'variables': {
-            # Setup some flags that are used below in both the XCode/ninja build as well as the
-            # cmake build.
-            'common_c_and_cpp_flags': [
-              '-mssse3',
-              '-fvisibility=hidden',
-              '-fvisibility-inlines-hidden',
-              '-Wall',
-              '-Wextra',
-              '-Winit-self',
-              '-Wpointer-arith',
-              '-Wsign-compare',
-              '-Wno-unused-parameter',
-            ],
-            'common_cpp_flags': [
-              '-fno-threadsafe-statics',
-              '-fno-exceptions',
-              '-fno-rtti',
-              '-std=c++11',
-              '-stdlib=libc++'
-            ],
-        },
         'defines': [ 'SK_BUILD_FOR_MAC' ],
         'conditions': [
             # ANGLE for mac hits -Wunneeded-internal-declaration if this isn't set.
             [ 'skia_angle', { 'defines': [ 'YY_NO_INPUT' ], } ],
         ],
         'configurations': {
           'Coverage': {
             'xcode_settings': {
                'GCC_OPTIMIZATION_LEVEL': '0',
                'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES',
@@ skipping 13 matching lines @@
             [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ],
             [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
             [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386']   }],
             [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
             [ 'skia_osx_deployment_target==""', {
               'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
             }, {
               'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
             }],
             [ 'skia_sanitizer', {
+              'GCC_ENABLE_CPP_RTTI': 'YES',                         # vptr needs rtti
               'OTHER_CFLAGS': [
                 '-fsanitize=<(skia_sanitizer)',                     # Turn on sanitizers.
                 '-fno-sanitize-recover=<(skia_sanitizer)',          # Make any failure fatal.
                 '-fsanitize-blacklist=<(skia_sanitizer_blacklist)', # Compile in our blacklist.
                 '-include <(skia_sanitizer_blacklist)',             # Make every .cpp depend on it.
               ],
-              'OTHER_CPLUSPLUSFLAGS': [
-                '-frtti',                                           # vptr needs rtti
-              ],
               # We want to pass -fsanitize=... to our final link call,
               # but not to libtool. OTHER_LDFLAGS is passed to both.
               # To trick GYP into doing what we want, we'll piggyback on
               # LIBRARY_SEARCH_PATHS, producing "-L/usr/lib -fsanitize=...".
               # The -L/usr/lib is redundant but innocuous: it's a default path.
               'LIBRARY_SEARCH_PATHS': [ '/usr/lib -fsanitize=<(skia_sanitizer)'],
             }],
           ],
           'CLANG_CXX_LIBRARY':                         'libc++',
+          'CLANG_CXX_LANGUAGE_STANDARD':               'c++11',
+          'GCC_ENABLE_CPP_EXCEPTIONS':                 'NO',   # -fno-exceptions
+          'GCC_ENABLE_CPP_RTTI':                       'NO',   # -fno-rtti
+          'GCC_THREADSAFE_STATICS':                    'NO',   # -fno-threadsafe-statics
+          'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',  # -mssse3
+          'GCC_SYMBOLS_PRIVATE_EXTERN':                'NO',   # -fvisibility=hidden
+          'GCC_INLINES_ARE_PRIVATE_EXTERN':            'NO',   # -fvisibility-inlines-hidden
           'GCC_CW_ASM_SYNTAX':                         'NO',   # remove -fasm-blocks
           'GCC_ENABLE_PASCAL_STRINGS':                 'NO',   # remove -mpascal-strings
-          # Used by XCode and ninja
-          'OTHER_CPLUSPLUSFLAGS': [
-            '<@(common_cpp_flags)',
-            '<@(common_c_and_cpp_flags)',
-          ],
-          'OTHER_CFLAGS': [
-            '<@(common_c_and_cpp_flags)',
+          'WARNING_CFLAGS': [
+            '-Wall',
+            '-Wextra',
+            '-Winit-self',
+            '-Wpointer-arith',
+            '-Wsign-compare',
+
+            '-Wno-unused-parameter',
           ],
         },
-        # Used by cmake
-        'cflags': [
-          '<@(common_c_and_cpp_flags)',
-        ],
-        'cflags_cc': [
-          '<@(common_cpp_flags)',
-        ],
       },
     ],
 
     [ 'skia_os == "ios"',
       {
         'defines': [
           'SK_BUILD_FOR_IOS',
         ],
         'conditions' : [
           [ 'skia_warnings_as_errors', {
@@ skipping 108 matching lines @@
           'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
       },
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }