Revert "Add support for EGL on linux"

This reverts commit 1cea736c3280b6f0553e3eaa598e41370b305b57.

Caused segfaults on all Android devices

R=bsalomon@google.com, djsollen@google.com
TBR=bsalomon, djsollen
NOTRY=true
BUG=skia:

Author: borenet@google.com

Review URL: https://codereview.chromium.org/599493003

3 files changed, 1 insertions, 33 deletions

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index b13b475267..6d791c9152 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -50,7 +50,6 @@
         'skia_arch_type%': 'x86',
         'arm_version%': 0,
         'arm_neon%': 0,
-        'skia_egl%': 0,
       },
 
       # Re-define all variables defined within the level-3 'variables' dict,
@@ -60,7 +59,6 @@
       'skia_arch_type%': '<(skia_arch_type)',
       'arm_version%': '<(arm_version)',
       'arm_neon%': '<(arm_neon)',
-      'skia_egl%': '<(skia_egl)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
@@ -89,7 +87,6 @@
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
-          'skia_egl%': 1,
         }, {
           'skia_static_initializers%': 1,
         }],
@@ -98,9 +95,6 @@
           'arm_version%': 7,
           'arm_neon%': 0, # neon asm files known not to work with the ios build
         }],
-        [ 'skia_os in "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
@@ -239,7 +233,6 @@
     '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)
     #
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 8cf9f76c48..7bb61f09b6 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -12,7 +12,6 @@
       }],
       ['skia_os != "linux" and skia_os != "chromeos"', {
         'sources/': [ ['exclude', '_unix.(h|cpp)$'],
-                      ['exclude', 'GrGLCreateNativeInterface_egl.cpp'],
         ],
       }],
       ['skia_os != "ios"', {
@@ -27,14 +26,6 @@
         'sources/': [ ['exclude', '_nacl.(h|cpp)$'],
         ],
       }],
-      ['skia_os == "nacl" or skia_egl == 0', {
-        'sources/': [ ['exclude', '_egl.(h|cpp)$'],
-        ],
-      }],
-      ['skia_egl == 1', {
-        'sources/': [ ['exclude', '_unix.(h|cpp)$'],
-        ],
-      }],
       # nullify the targets in this gyp file if skia_gpu is 0
       [ 'skia_gpu == 0', {
         'sources/': [
@@ -149,16 +140,6 @@
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
-        }],
-        [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
-          'link_settings': {
-            'libraries': [
-              '-lEGL',
-              '-lGLESv2',
-            ],
-          },
-        }],
-        [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
           'link_settings': {
             'libraries': [
               '-lGL',
@@ -174,11 +155,6 @@
             ],
           },
         }],
-        [ 'skia_egl==1', {
-          'defines': [
-            'SK_EGL',
-          ],
-        }],
         [ 'skia_mesa and skia_os == "linux"', {
           'link_settings': {
             'libraries': [
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 3b2d80126f..ebc07b264b 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -297,7 +297,6 @@
       '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp',
       '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
       '<(skia_src_path)/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp',
-      '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp',
       '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
       '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
 
@@ -307,7 +306,7 @@
       '<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp',
       '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp',
       '<(skia_src_path)/gpu/gl/unix/SkNativeGLContext_unix.cpp',
-      '<(skia_src_path)/gpu/gl/egl/SkNativeGLContext_egl.cpp',
+      '<(skia_src_path)/gpu/gl/android/SkNativeGLContext_android.cpp',
       '<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm',
     ],
     'skgpu_mesa_gl_sources': [