Move SkTemplates.h to private.

gyp/tools.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
@@ skipping 145 matching lines @@
         '../tools/skdiff.h',
         '../tools/skdiff_html.cpp',
         '../tools/skdiff_html.h',
         '../tools/skdiff_main.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
+      'xcode_settings': {

[bungeman-skia, 2015/08/19 18:29:55]

This makes this particular change work. I tried putting this in a
target_defaults, both in this file and in apptype_console.gypi, but that doesn't
seem to work. That adds CLANG_CXX_LIBRARY, but will not override
MACOSX_DEPLOYMENT_TARGET. I think we'll need to figure that out later.

+        'conditions': [
+          [ 'skia_osx_deployment_target==""', {
+            'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
+          }, {
+            'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
+          }],
+        ],
+        'CLANG_CXX_LIBRARY': 'libc++',
+      },
     },
     {
       'target_name': 'skpdiff',
       'type': 'executable',
       'sources': [
         '../tools/skpdiff/skpdiff_main.cpp',
         '../tools/skpdiff/SkDiffContext.cpp',
         '../tools/skpdiff/SkImageDiffer.cpp',
         '../tools/skpdiff/SkPMetric.cpp',
         '../tools/skpdiff/skpdiff_util.cpp',
@@ skipping 623 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }