ppapi_egl target is currently unused as verified by using:

  grep --include="*.gyp*" -nr -F "ppapi_egl" .

However this library causes NaCl to require third_party/mesa which relative to NaCl is large.

This CL moves the definition of this static library from ppapi to the lib/gl directory under ppapi so that PPAPI users are not forced to DEPS in mesa.

Review URL: http://codereview.chromium.org/6342012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72090 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 55 insertions, 40 deletions

diff --git a/ppapi/lib/gl/gl.gyp b/ppapi/lib/gl/gl.gyp
new file mode 100644
index 0000000..e7ffad3
--- /dev/null
+++ b/ppapi/lib/gl/gl.gyp
@@ -0,0 +1,55 @@
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+# This file was split off from ppapi.gyp to prevent PPAPI users from
+# needing to DEPS in ~10K files due to mesa.
+
+{
+  'includes': [
+    '../../../third_party/mesa/mesa.gypi',
+  ],
+  'variables': {
+    'chromium_code': 1,  # Use higher warning level.
+  },
+  'targets': [
+    {
+      'target_name': 'ppapi_egl',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
+      ],
+      'include_dirs': [
+        'include',
+      ],
+      'defines': [
+        # Do not export internal Mesa funcations. Exporting them is not
+        # required because we are compiling both - API dispatcher and driver
+        # into a single library.
+        'PUBLIC=',
+        # Define a new PPAPI platform.
+        '_EGL_PLATFORM_PPAPI=_EGL_NUM_PLATFORMS',
+        '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_PPAPI',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'defines': [
+            '_EGL_OS_WINDOWS',
+          ],
+        }],
+        ['OS=="mac"', {
+          # TODO(alokp): Make this compile on mac.
+          'suppress_wildcard': 1,
+        }],
+      ],
+      'sources': [
+        # Mesa EGL API dispatcher sources.
+        '<@(mesa_egl_sources)',
+        # PPAPI EGL driver sources.
+        'egl/egldriver.c',
+        'egl/egldriver_ppapi.c',
+      ],
+    },
+  ],
+}
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 90bd2d1..ae5b4ed 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../third_party/mesa/mesa.gypi',
-  ],
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
   },
@@ -266,43 +263,6 @@
       ],
     },
     {
-      'target_name': 'ppapi_egl',
-      'type': 'static_library',
-      'dependencies': [
-        'ppapi_c',
-      ],
-      'include_dirs': [
-        'lib/gl/include',
-      ],
-      'defines': [
-        # Do not export internal Mesa funcations. Exporting them is not
-        # required because we are compiling both - API dispatcher and driver
-        # into a single library.
-        'PUBLIC=',
-        # Define a new PPAPI platform.
-        '_EGL_PLATFORM_PPAPI=_EGL_NUM_PLATFORMS',
-        '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_PPAPI',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'defines': [
-            '_EGL_OS_WINDOWS',
-          ],
-        }],
-        ['OS=="mac"', {
-          # TODO(alokp): Make this compile on mac.
-          'suppress_wildcard': 1,
-        }],
-      ],
-      'sources': [
-        # Mesa EGL API dispatcher sources.
-        '<@(mesa_egl_sources)',
-        # PPAPI EGL driver sources.
-        'lib/gl/egl/egldriver.c',
-        'lib/gl/egl/egldriver_ppapi.c',
-      ],
-    },
-    {
       'target_name': 'ppapi_gles2',
       'type': 'static_library',
       'dependencies': [