Fix defines being exported outside of ANGLE

This should fix a build failure on a GPU try bot so we can Roll ANGLE BUG=angleproject:892 Change-Id: I86cb0135dc71b003f691633e339d5d0527eaace4 Reviewed-on: https://chromium-review.googlesource.com/280396Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Fix defines being exported outside of ANGLE
e1a5518e · Corentin Wallez · 62342590 · e1a5518e · e1a5518e
Commit e1a5518e authored Jun 18, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

libEGL.gypi src/libEGL.gypi +9 -2

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

No files found.
--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -10,8 +10,15 @@
        {
            'target_name': 'libEGL',
            'type': 'shared_library',
-            'dependencies': [ 'libGLESv2', ],
+            'dependencies':
-            'includes': [ '../build/common_defines.gypi', ],
+            [
+                'libANGLE',
+                'libGLESv2',
+            ],
+            'includes':
+            [
+                '../build/common_defines.gypi',
+            ],
            'include_dirs':
            [
                '.',

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -743,10 +743,6 @@
            'type': 'shared_library',
            'dependencies': [ 'libANGLE' ],
            'includes': [ '../build/common_defines.gypi', ],
-            'export_dependent_settings':
-            [
-                'libANGLE',
-            ],
            'sources':
            [
                '<@(libglesv2_sources)',