Changes to merge vulkan code

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 23 matching lines @@
   #
   # See http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi?revision=127004 ,
   # which deals with these same constraints in a similar manner.
   #
   'variables': {  # level 1
     'angle_path%': '../',
 
     'skia_mojo%': '0',
 
     'variables': {  # level 2
-
       # Variables needed by conditions list within the level-2 variables dict.
       'variables': {  # level 3
         'variables': { # level 4
           # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
           # for cross-compilation (e.g. building for either MacOS or iOS on Mac).
           # We set it automatically based on 'OS' (the host OS), but allow the
           # user to override it via GYP_DEFINES if they like.
           'skia_os%': '<(OS)',
         },
         'skia_os%': '<(skia_os)',
-
+        'vulkan_merged_into_skia': '1',
         'skia_android_framework%': 0,
         'conditions' : [
           [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
             'skia_arch_type%': 'x86_64',
           }, {
             'skia_arch_type%': 'x86',
           }],
           # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
           # controlled by skia_codec_decodes_raw.
           ['skia_os == "chromeos" or skia_os == "win"', {
@@ skipping 10 matching lines @@
 
       # Re-define all variables defined within the level-3 'variables' dict,
       # so that siblings of the level-2 'variables' dict can see them.
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
       'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
       'skia_arch_type%': '<(skia_arch_type)',
       'arm_version%': '<(arm_version)',
       'arm_neon%': '<(arm_neon)',
       'skia_egl%': '<(skia_egl)',
-
+      'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)',
       'conditions': [
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
           'skia_use_android_framework_defines%': 1,
           'skia_use_system_json%': 1,
         }, {
           'skia_os%': '<(skia_os)',
           'skia_chrome_utils%': 1,
           'skia_use_android_framework_defines%': 0,
@@ skipping 149 matching lines @@
     'ios_sdk_version%': '6.0',
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
     'skia_disable_inlining%': 0,
     'skia_moz2d%': 0,
     'skia_is_bot%': '<(skia_is_bot)',
     'skia_egl%': '<(skia_egl)',
     'skia_use_sdl%': 0,
     'skia_fast%': 0,
     'skia_dump_stats%': 0,
     'skia_build_server%': 0,
+    'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)',
     'skia_fast_flags': [
         '-O3',                   # Even for Debug builds.
         '-march=native',         # Use all features of and optimize for THIS machine.
         '-fomit-frame-pointer',  # Sometimes an extra register is nice, and cuts a push/pop.
         #'-ffast-math',           # Optimize float math even when it breaks IEEE compliance.
         #'-flto'                  # Enable link-time optimization.
     ],
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }