- Proper inclusion of gypi files, so that they do not override

vm/token.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_TOKEN_H_
 #define VM_TOKEN_H_
 
 #include "platform/assert.h"
 
 namespace dart {
@@ skipping 249 matching lines @@
   static bool NeedsLiteralToken(Kind tok) {
     ASSERT(tok < kNumTokens);
     return ((tok == Token::kINTEGER) ||
             (tok == Token::kSTRING) ||
             (tok == Token::kINTERPOL_VAR) ||
             (tok == Token::kERROR) ||
             (tok == Token::kDOUBLE));
   }
 
  private:
-  static const char* name_[kNumTokens];
-  static const char* tok_str_[kNumTokens];
-  static const uint8_t precedence_[kNumTokens];
-  static const Attribute attributes_[kNumTokens];
+  static const char* name_[];
+  static const char* tok_str_[];
+  static const uint8_t precedence_[];
+  static const Attribute attributes_[];
 };
 
 
 }  // namespace dart
 
 #endif  // VM_TOKEN_H_