Revert "Add loadable_module versions of libEGL and libGLESv2."

This reverts commit 6beb0bfd. It caused compile failures on win_clang_dbg because when building libEGL_ANGLE.dll DllMainCRTStartup wasn't defined. Change-Id: I8080f8db373f5988d86560da1b8b2a1bae30d3ea Reviewed-on: https://chromium-review.googlesource.com/318460Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Revert "Add loadable_module versions of libEGL and libGLESv2."
4bc76d07 · Corentin Wallez · 91dec84c · 4bc76d07 · 4bc76d07 · 4bc76d07
Commit 4bc76d07 authored Dec 15, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 52 deletions

BUILD.gn BUILD.gn +0 -12

libEGL.gypi src/libEGL.gypi +0 -21

libGLESv2.gypi src/libGLESv2.gypi +0 -19

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -338,12 +338,6 @@ shared_library("libGLESv2") {
  ]
 }

-shared_library("libGLESv2_ANGLE") {
-  deps = [
-    ":libGLESv2"
-  ]
-}
-
 shared_library("libEGL") {
  sources = rebase_path(gles_gypi.libegl_sources, ".", "src")

@@ -371,12 +365,6 @@ shared_library("libEGL") {
  ]
 }

-shared_library("libEGL_ANGLE") {
-  deps = [
-    ":libEGL"
-  ]
-}
-
 util_gypi = exec_script(
  "//build/gypi_to_gn.py",
  [ rebase_path("util/util.gyp") ],

--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -5,10 +5,6 @@
 {
    # Everything below this is duplicated in the GN build. If you change
    # anything also change angle/BUILD.gn
-    'variables':
-    {
-        'angle_standalone%': 0,
-    },
    'targets':
    [
        {
@@ -41,21 +37,4 @@
            ],
        },
    ],
-    'conditions':
-    [
-        ['angle_standalone==0',
-        {
-            'targets':
-            [
-                {
-                    'target_name': 'libEGL_ANGLE',
-                    'type': 'loadable_module',
-                    'dependencies':
-                    [
-                        'libEGL',
-                    ],
-                },
-            ],
-        }],
-    ],
 }
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -5,8 +5,6 @@
 {
    'variables':
    {
-        'angle_standalone%': 0,
-
        # These file lists are shared with the GN build.
        'libangle_common_sources':
        [
@@ -820,21 +818,4 @@
            ],
        },
    ],
-    'conditions':
-    [
-        ['angle_standalone==0',
-        {
-            'targets':
-            [
-                {
-                    'target_name': 'libGLESv2_ANGLE',
-                    'type': 'loadable_module',
-                    'dependencies':
-                    [
-                        'libGLESv2',
-                    ],
-                },
-            ],
-        }],
-    ],
 }