Add angle_gl_library_type to allow making static libGLESv2 and libEGL

With this commit angle programs can be run under apitrace: when we use shared libraries, the apitrace driver shim shadows ANGLE and redirects the GL calls to the driver, which is not what we want. BUG=angleproject:892 Change-Id: I32535ba8db6202b0b5b285e86abd472366ee3d03 Reviewed-on: https://chromium-review.googlesource.com/287270Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Add angle_gl_library_type to allow making static libGLESv2 and libEGL
ea7c5c19 · Corentin Wallez · 096725bc · ea7c5c19 · ea7c5c19 · ea7c5c19
Commit ea7c5c19 authored Jul 21, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

angle.gyp src/angle.gyp +1 -0

libEGL.gypi src/libEGL.gypi +1 -1

libGLESv2.gypi src/libGLESv2.gypi +1 -1

No files found.
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -18,6 +18,7 @@
        'angle_enable_gl%': 0,
        'angle_enable_hlsl%': 0,
        'angle_link_glx%': 0,
+        'angle_gl_library_type%': 'shared_library',
        'conditions':
        [
            ['OS=="win"',

--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -9,7 +9,7 @@
    [
        {
            'target_name': 'libEGL',
-            'type': 'shared_library',
+            'type': '<(angle_gl_library_type)',
            'dependencies':
            [
                'libANGLE',

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -747,7 +747,7 @@
        },
        {
            'target_name': 'libGLESv2',
-            'type': 'shared_library',
+            'type': '<(angle_gl_library_type)',
            'dependencies': [ 'libANGLE', 'angle_common' ],
            'includes': [ '../build/common_defines.gypi', ],
            'sources':