Add loadable_module versions of libEGL and libGLESv2.

Reland with a link fix for Clang on Windows In order to implement the --use-gl=angle Chrome flag on Linux, we need to have the ANGLE .so directly in the build directory however GYP places shared_libraries under lib/ on Linux. On the contrary loadable_modules cannot be linked against so we need to keep the shared_library targets. This commit adds _ANGLE versions of the libEGL and libGLESv2 targets as loadable module that depend on their respective shared library. BUG=522967 Change-Id: Iad968ab786b94b6041c279921de99633d23b48a7 Reviewed-on: https://chromium-review.googlesource.com/318470 Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Add loadable_module versions of libEGL and libGLESv2.
c89df2ba · Corentin Wallez · 1fae3556 · c89df2ba · c89df2ba · c89df2ba
Commit c89df2ba authored Dec 07, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 56 additions and 0 deletions

BUILD.gn BUILD.gn +16 -0

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

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

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

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

@@ -377,6 +385,14 @@ shared_library("libEGL") {
  ]
 }

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

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