Commit 4bc76d07 by Corentin Wallez

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: 's avatarCorentin Wallez <cwallez@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 91dec84c
...@@ -338,12 +338,6 @@ shared_library("libGLESv2") { ...@@ -338,12 +338,6 @@ shared_library("libGLESv2") {
] ]
} }
shared_library("libGLESv2_ANGLE") {
deps = [
":libGLESv2"
]
}
shared_library("libEGL") { shared_library("libEGL") {
sources = rebase_path(gles_gypi.libegl_sources, ".", "src") sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
...@@ -371,12 +365,6 @@ shared_library("libEGL") { ...@@ -371,12 +365,6 @@ shared_library("libEGL") {
] ]
} }
shared_library("libEGL_ANGLE") {
deps = [
":libEGL"
]
}
util_gypi = exec_script( util_gypi = exec_script(
"//build/gypi_to_gn.py", "//build/gypi_to_gn.py",
[ rebase_path("util/util.gyp") ], [ rebase_path("util/util.gyp") ],
......
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
{ {
# Everything below this is duplicated in the GN build. If you change # Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn # anything also change angle/BUILD.gn
'variables':
{
'angle_standalone%': 0,
},
'targets': 'targets':
[ [
{ {
...@@ -41,21 +37,4 @@ ...@@ -41,21 +37,4 @@
], ],
}, },
], ],
'conditions':
[
['angle_standalone==0',
{
'targets':
[
{
'target_name': 'libEGL_ANGLE',
'type': 'loadable_module',
'dependencies':
[
'libEGL',
],
},
],
}],
],
} }
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
{ {
'variables': 'variables':
{ {
'angle_standalone%': 0,
# These file lists are shared with the GN build. # These file lists are shared with the GN build.
'libangle_common_sources': 'libangle_common_sources':
[ [
...@@ -820,21 +818,4 @@ ...@@ -820,21 +818,4 @@
], ],
}, },
], ],
'conditions':
[
['angle_standalone==0',
{
'targets':
[
{
'target_name': 'libGLESv2_ANGLE',
'type': 'loadable_module',
'dependencies':
[
'libGLESv2',
],
},
],
}],
],
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment