sdk files reorganization to make dart2js a proper package

pkg/analyzer/lib/src/generated/sdk_io.dart

Index: pkg/analyzer/lib/src/generated/sdk_io.dart
diff --git a/pkg/analyzer/lib/src/generated/sdk_io.dart b/pkg/analyzer/lib/src/generated/sdk_io.dart
index 21dff72cd50cd292515288a5e789ffe8ab00f303..0823e0f621ca627743407418f762b76b5c9c4155 100644
--- a/pkg/analyzer/lib/src/generated/sdk_io.dart
+++ b/pkg/analyzer/lib/src/generated/sdk_io.dart
@@ -103,11 +103,23 @@ class DirectoryBasedDartSdk implements DartSdk {
 
   /**
    * The name of the directory within the SDK directory that contains the
-   * libraries file.
+   * libraries_spec directory.
    */
   static String _INTERNAL_DIR = "_internal";
 
   /**
+   * The name of the libraries_spec directory that contains the package holding
+   * the libraries.dart file.
+   */
+  static String _LIBRARY_SPEC_DIR_NAME = "libraries_spec";
+
+  /**
+   * The name of the directory within the libraries_spec that contains
+   * libraries.dart.
+   */
+  static String _LIBARRY_SPEC_LIB_DIR = "lib";
+
+  /**
    * The name of the directory within the SDK directory that contains the
    * libraries.
    */
@@ -463,7 +475,11 @@ class DirectoryBasedDartSdk implements DartSdk {
    */
   LibraryMap initialLibraryMap(bool useDart2jsPaths) {
     JavaFile librariesFile = new JavaFile.relative(
-        new JavaFile.relative(libraryDirectory, _INTERNAL_DIR),
+        new JavaFile.relative(
+          new JavaFile.relative(
+            new JavaFile.relative(libraryDirectory, _INTERNAL_DIR),
+            _LIBRARY_SPEC_DIR_NAME),
+          _LIBARRY_SPEC_LIB_DIR),
         _LIBRARIES_FILE);
     try {
       String contents = librariesFile.readAsStringSync();
@@ -515,14 +531,15 @@ class DirectoryBasedDartSdk implements DartSdk {
 
 /**
  * An object used to read and parse the libraries file
- * (dart-sdk/lib/_internal/libraries.dart) for information about the libraries
- * in an SDK. The library information is represented as a Dart file containing a
- * single top-level variable whose value is a const map. The keys of the map are
- * the names of libraries defined in the SDK and the values in the map are info
- * objects defining the library. For example, a subset of a typical SDK might
- * have a libraries file that looks like the following:
+ * (dart-sdk/lib/_internal/libraries_spec/lib/libraries.dart) for information
+ * about the libraries in an SDK. The library information is represented as a
+ * Dart file containing a single top-level variable whose value is a const map.
+ * The keys of the map are the names of libraries defined in the SDK and the
+ * values in the map are info objects defining the library. For example, a
+ * subset of a typical SDK might have a libraries file that looks like the
+ * following:
  *
- *     final Map<String, LibraryInfo> LIBRARIES = const <LibraryInfo> {
+ *     final Map<String, LibraryInfo> LIBRARIES = const <LibraryInfo> {
  *       // Used by VM applications
  *       "builtin" : const LibraryInfo(
  *         "builtin/builtin_runtime.dart",