Cleanup public includes directory.

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index dae1cf58c799a2f31c85c38a9520cae5206727f3..ea8f5c0da1a0cfac590631aaa32f7c427c540517 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -30,6 +30,7 @@
         'skpmaker',
         'skimage',
         'test_image_decoder',
+        'test_public_includes',
       ],
       'conditions': [
         ['skia_shared_lib',
@@ -621,6 +622,74 @@
         'include_dirs': [ '../tools', ],
       },
     },
+    {
+      'target_name': 'test_public_includes',
+      'type': 'static_library',
+      #'cflags!': [ '-Wno-unused-parameter' ],
+      'variables': {
+        'includes_to_test': [
+          '<(skia_include_path)/animator',
+          '<(skia_include_path)/c',
+          '<(skia_include_path)/config',
+          '<(skia_include_path)/core',
+          '<(skia_include_path)/effects',
+          '<(skia_include_path)/gpu',
+          '<(skia_include_path)/images',
+          '<(skia_include_path)/pathops',
+          '<(skia_include_path)/pdf',
+          '<(skia_include_path)/pipe',
+          '<(skia_include_path)/ports',
+          '<(skia_include_path)/svg',
+          '<(skia_include_path)/utils',
+          '<(skia_include_path)/views',
+          '<(skia_include_path)/xml',
+        ],
+        'paths_to_ignore': [
+          '<(skia_include_path)/gpu/gl/GrGLConfig_chrome.h',
+          '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h',
+          '<(skia_include_path)/ports/SkTypeface_mac.h',
+          '<(skia_include_path)/ports/SkTypeface_win.h',
+          '<(skia_include_path)/utils/ios',
+          '<(skia_include_path)/utils/mac',
+          '<(skia_include_path)/utils/win',
+          '<(skia_include_path)/utils/SkDebugUtils.h',
+          '<(skia_include_path)/utils/SkJSONCPP.h',
+          '<(skia_include_path)/utils/SkWGL.h',
+          '<(skia_include_path)/views/SkOSWindow_Android.h',
+          '<(skia_include_path)/views/SkOSWindow_iOS.h',
+          '<(skia_include_path)/views/SkOSWindow_Mac.h',
+          '<(skia_include_path)/views/SkOSWindow_NaCl.h',
+          '<(skia_include_path)/views/SkOSWindow_SDL.h',
+          '<(skia_include_path)/views/SkOSWindow_Unix.h',
+          '<(skia_include_path)/views/SkOSWindow_Win.h',
+          '<(skia_include_path)/views/animated',
+        ],
+      },
+      'include_dirs': [
+        '<@(includes_to_test)',
+      ],
+      'sources': [
+        # unused_param_test.cpp is generated by the action below.
+        '<(INTERMEDIATE_DIR)/test_public_includes.cpp',
+      ],
+      'actions': [
+        {
+          'action_name': 'generate_includes_cpp',
+          'inputs': [
+            '../tools/generate_includes_cpp.py',
+            '<@(includes_to_test)',
+            # This causes the gyp generator on mac to fail
+            #'<@(paths_to_ignore)',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/test_public_includes.cpp',
+          ],
+          'action': ['python', '../tools/generate_includes_cpp.py',
+                               '--ignore', '<(paths_to_ignore)',
+                               '<@(_outputs)', '<@(includes_to_test)'],
+        },
+      ],
+    },
   ],
   'conditions': [
     ['skia_shared_lib',