Fix libGLESv2 wrong .def file.

The GN was including both libGLESv2.def and _autogen. This fixes the GN to only include _autogen, and removes the .def include from the static build target. Bug: angleproject:2476 Change-Id: I2e856e3bbe875bdadd1add4517cef60a11227047 Reviewed-on: https://chromium-review.googlesource.com/1057451Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Brandon1 Jones <brandon1.jones@intel.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fix libGLESv2 wrong .def file.
74a76320 · Jamie Madill · Commit Bot · b878f00d · 74a76320 · 74a76320
Commit 74a76320 authored May 14, 2018 by Jamie Madill Committed by Commit Bot May 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

BUILD.gn BUILD.gn +2 -2

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

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

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -612,8 +612,8 @@ shared_library("libGLESv2${angle_libs_suffix}") {
  }

  if (is_win) {
-    ldflags =
-        [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
+    ldflags = [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2_autogen.def",
+                                      root_build_dir) ]
  }

  if (is_mac && !is_component_build) {

--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -25,6 +25,7 @@
            ],
            'sources':
            [
+                'libEGL/libEGL.def',
                '<@(libegl_sources)',
            ],
            'conditions':

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -897,7 +897,6 @@
            'libGLESv2/global_state.cpp',
            'libGLESv2/global_state.h',
            'libGLESv2/libGLESv2_autogen.cpp',
-            'libGLESv2/libGLESv2_autogen.def',
            'libGLESv2/libGLESv2.rc',
            'libGLESv2/proc_table.h',
            'libGLESv2/proc_table_autogen.cpp',
@@ -913,7 +912,6 @@
        'libegl_sources':
        [
            'libEGL/libEGL.cpp',
-            'libEGL/libEGL.def',
            'libEGL/libEGL.rc',
            'libEGL/resource.h',
        ],
@@ -1283,6 +1281,7 @@
            'includes': [ '../gyp/common_defines.gypi', ],
            'sources':
            [
+                'libGLESv2/libGLESv2_autogen.def',
                '<@(libglesv2_sources)',
            ],
            'defines':