| Index: mojo/mojo_public.gypi
 | 
| diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
 | 
| index 9e06c042402e20d3ef0cc182311c0c92053068d3..84bfe882f45a1d994a5e7382016d6ecd07a9b261 100644
 | 
| --- a/mojo/mojo_public.gypi
 | 
| +++ b/mojo/mojo_public.gypi
 | 
| @@ -248,32 +248,6 @@
 | 
|        'sources': [
 | 
|          'public/bindings/js/constants.cc',
 | 
|          'public/bindings/js/constants.h',
 | 
| -        'public/bindings/lib/array.cc',
 | 
| -        'public/bindings/lib/array_internal.h',
 | 
| -        'public/bindings/lib/array_internal.cc',
 | 
| -        'public/bindings/lib/bindings_internal.h',
 | 
| -        'public/bindings/lib/bindings_serialization.cc',
 | 
| -        'public/bindings/lib/bindings_serialization.h',
 | 
| -        'public/bindings/lib/buffer.cc',
 | 
| -        'public/bindings/lib/callback_internal.h',
 | 
| -        'public/bindings/lib/connector.cc',
 | 
| -        'public/bindings/lib/connector.h',
 | 
| -        'public/bindings/lib/fixed_buffer.cc',
 | 
| -        'public/bindings/lib/fixed_buffer.h',
 | 
| -        'public/bindings/lib/interface.cc',
 | 
| -        'public/bindings/lib/message.cc',
 | 
| -        'public/bindings/lib/message_builder.cc',
 | 
| -        'public/bindings/lib/message_builder.h',
 | 
| -        'public/bindings/lib/message_internal.h',
 | 
| -        'public/bindings/lib/message_queue.cc',
 | 
| -        'public/bindings/lib/message_queue.h',
 | 
| -        'public/bindings/lib/router.cc',
 | 
| -        'public/bindings/lib/router.h',
 | 
| -        'public/bindings/lib/scratch_buffer.cc',
 | 
| -        'public/bindings/lib/scratch_buffer.h',
 | 
| -        'public/bindings/lib/shared_data.h',
 | 
| -        'public/bindings/lib/shared_ptr.h',
 | 
| -        'public/bindings/lib/sync_dispatcher.cc',
 | 
|          'public/cpp/bindings/allocation_scope.h',
 | 
|          'public/cpp/bindings/array.h',
 | 
|          'public/cpp/bindings/buffer.h',
 | 
| @@ -285,6 +259,32 @@
 | 
|          'public/cpp/bindings/remote_ptr.h',
 | 
|          'public/cpp/bindings/sync_dispatcher.h',
 | 
|          'public/cpp/bindings/type_converter.h',
 | 
| +        'public/cpp/bindings/lib/array.cc',
 | 
| +        'public/cpp/bindings/lib/array_internal.h',
 | 
| +        'public/cpp/bindings/lib/array_internal.cc',
 | 
| +        'public/cpp/bindings/lib/bindings_internal.h',
 | 
| +        'public/cpp/bindings/lib/bindings_serialization.cc',
 | 
| +        'public/cpp/bindings/lib/bindings_serialization.h',
 | 
| +        'public/cpp/bindings/lib/buffer.cc',
 | 
| +        'public/cpp/bindings/lib/callback_internal.h',
 | 
| +        'public/cpp/bindings/lib/connector.cc',
 | 
| +        'public/cpp/bindings/lib/connector.h',
 | 
| +        'public/cpp/bindings/lib/fixed_buffer.cc',
 | 
| +        'public/cpp/bindings/lib/fixed_buffer.h',
 | 
| +        'public/cpp/bindings/lib/interface.cc',
 | 
| +        'public/cpp/bindings/lib/message.cc',
 | 
| +        'public/cpp/bindings/lib/message_builder.cc',
 | 
| +        'public/cpp/bindings/lib/message_builder.h',
 | 
| +        'public/cpp/bindings/lib/message_internal.h',
 | 
| +        'public/cpp/bindings/lib/message_queue.cc',
 | 
| +        'public/cpp/bindings/lib/message_queue.h',
 | 
| +        'public/cpp/bindings/lib/router.cc',
 | 
| +        'public/cpp/bindings/lib/router.h',
 | 
| +        'public/cpp/bindings/lib/scratch_buffer.cc',
 | 
| +        'public/cpp/bindings/lib/scratch_buffer.h',
 | 
| +        'public/cpp/bindings/lib/shared_data.h',
 | 
| +        'public/cpp/bindings/lib/shared_ptr.h',
 | 
| +        'public/cpp/bindings/lib/sync_dispatcher.cc',
 | 
|        ],
 | 
|      },
 | 
|      {
 | 
| 
 |