Merge the Sky Engine changes from the SkyDart branch

sky/engine/build/scripts/name_macros.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 113 matching lines @@
             path = entry['name']
         return path + '.h'
 
     def _headers_header_includes(self, entries):
         includes = dict()
         for entry in entries:
             cpp_name = name_utilities.cpp_name(entry)
             # Avoid duplicate includes.
             if cpp_name in includes:
                 continue
-            if self.suffix == 'Modules':
-                subdir_name = 'modules'
-            else:
-                subdir_name = 'core'
-            include = '#include "%(path)s"\n#include "bindings/%(subdir_name)s/v8/V8%(script_name)s.h"' % {
+            include = '#include "%(path)s"\n' % {
                 'path': self._headers_header_include_path(entry),
-                'script_name': name_utilities.script_name(entry),
-                'subdir_name': subdir_name,
             }
             includes[cpp_name] = self.wrap_with_condition(include, entry['Conditional'])
         return includes.values()
 
     def generate_headers_header(self):
         base_header_for_suffix = ''
         if self.suffix:
             base_header_for_suffix = '\n#include "core/%(namespace)sHeaders.h"\n' % {'namespace': self.namespace}
         return HEADER_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
@@ skipping 40 matching lines @@
         return INTERFACES_HEADER_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'namespace': self.namespace,
             'suffix': self.suffix,
             'base_header_for_suffix': base_header_for_suffix,
             'macro_style_name': name_utilities.to_macro_style(self.namespace + self.suffix),
             'declare_conditional_macros': self._declare_conditional_macros(),
             'unconditional_macros': '\n'.join(sorted(set(map(self._unconditional_macro, self._unconditional_entries)))),
             'conditional_macros': '\n'.join(map(self._conditional_macros, self._entries_by_conditional.keys())),
         }