Remove libpng and zlib from dEQP include dirs.

These extra include dirs were not being rebased correctly in the BUILD.gn side. Instead add them later in angle_deqp_support. The GN build already had the correct deps in any case. BUG=angleproject:1569 Change-Id: Ieb4fab47bd9948a3309da239f2efdafbfcc8782c Reviewed-on: https://chromium-review.googlesource.com/722065Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Remove libpng and zlib from dEQP include dirs.
ce252b28 · Jamie Madill · Commit Bot · 2d88e9bc · ce252b28
Commit ce252b28 authored Oct 16, 2017 by Jamie Madill Committed by Commit Bot Oct 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

deqp.gypi src/tests/deqp.gypi +6 -3

No files found.
--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -108,8 +108,6 @@
            '<(deqp_path)/modules/gles31/stress',
            '<(deqp_path)/modules/glshared',
            '<(deqp_path)/modules/glusecases',
-            '<(libpng_path)',
-            '<(zlib_path)',
        ],
        'deqp_gles2_sources':
        [
@@ -1468,7 +1466,12 @@
                            '-fno-exceptions',
                            '-fno-rtti',
                        ],
-                        'include_dirs': ['<@(deqp_include_dirs)'],
+                        'include_dirs':
+                        [
+                            '<@(deqp_include_dirs)'
+                            '<(libpng_path)',
+                            '<(zlib_path)',
+                        ],
                        'defines': ['<@(deqp_defines)'],
                        'defines!': [ '<@(deqp_undefines)' ],
                        'msvs_settings':