Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / gyp / common_variables.gypi

diff --git a/src/third_party/skia/gyp/common_variables.gypi b/src/third_party/skia/gyp/common_variables.gypi
index 6d791c9..ab25eef 100644 (file)
--- a/src/third_party/skia/gyp/common_variables.gypi
+++ b/src/third_party/skia/gyp/common_variables.gypi
@@ -50,6 +50,7 @@
         'skia_arch_type%': 'x86',
         'arm_version%': 0,
         'arm_neon%': 0,
+        'skia_egl%': 0,
       },
 
       # Re-define all variables defined within the level-3 'variables' dict,
@@ -59,6 +60,7 @@
       'skia_arch_type%': '<(skia_arch_type)',
       'arm_version%': '<(arm_version)',
       'arm_neon%': '<(arm_neon)',
+      'skia_egl%': '<(skia_egl)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
@@ -87,6 +89,7 @@
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
+          'skia_egl%': 1,
         }, {
           'skia_static_initializers%': 1,
         }],
@@ -95,6 +98,9 @@
           'arm_version%': 7,
           'arm_neon%': 0, # neon asm files known not to work with the ios build
         }],
+        [ 'skia_os == "nacl"', {
+          'skia_egl%': 1,
+        }],
         [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
           # skia_freetype_static - on OS variants that normally would
           #     dynamically link the system FreeType library, don't do
@@ -233,6 +239,7 @@
     'skia_disable_inlining%': 0,
     'skia_moz2d%': 0,
     'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)")',
+    'skia_egl%': '<(skia_egl)',
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #