1 files changed, 21 insertions, 14 deletions
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index b921e18..448f1de 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -79,16 +79,16 @@
         'mojo_utility',
       ],
       'sources': [
-        'public/tests/bindings/array_unittest.cc',
-        'public/tests/bindings/connector_unittest.cc',
-        'public/tests/bindings/handle_passing_unittest.cc',
-        'public/tests/bindings/remote_ptr_unittest.cc',
-        'public/tests/bindings/type_conversion_unittest.cc',
-        'public/tests/bindings/buffer_unittest.cc',
-        'public/tests/bindings/math_calculator.mojom',
-        'public/tests/bindings/sample_factory.mojom',
-        'public/tests/bindings/sample_service_unittest.cc',
-        'public/tests/bindings/test_structs.mojom',
+        'public/bindings/tests/array_unittest.cc',
+        'public/bindings/tests/connector_unittest.cc',
+        'public/bindings/tests/handle_passing_unittest.cc',
+        'public/bindings/tests/remote_ptr_unittest.cc',
+        'public/bindings/tests/type_conversion_unittest.cc',
+        'public/bindings/tests/buffer_unittest.cc',
+        'public/bindings/tests/math_calculator.mojom',
+        'public/bindings/tests/sample_factory.mojom',
+        'public/bindings/tests/sample_service_unittest.cc',
+        'public/bindings/tests/test_structs.mojom',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
     },
@@ -163,31 +163,38 @@
         '..'
       ],
       'sources': [
+        'public/bindings/allocation_scope.h',
+        'public/bindings/array.h',
+        'public/bindings/buffer.h',
+        'public/bindings/passable.h',
+        'public/bindings/remote_ptr.h',
+        'public/bindings/type_converter.h',
         'public/bindings/lib/array.cc',
-        'public/bindings/lib/array.h',
         'public/bindings/lib/array_internal.h',
         'public/bindings/lib/array_internal.cc',
-        'public/bindings/lib/bindings.h',
         '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/buffer.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/message.cc',
         'public/bindings/lib/message.h',
         'public/bindings/lib/message_builder.cc',
         'public/bindings/lib/message_builder.h',
         'public/bindings/lib/message_queue.cc',
         'public/bindings/lib/message_queue.h',
+        'public/bindings/lib/scratch_buffer.cc',
+        'public/bindings/lib/scratch_buffer.h',
       ],
     },
     {
       'target_name': 'mojo_sample_service',
       'type': 'static_library',
       'sources': [
-        'public/tests/bindings/sample_service.mojom',
+        'public/bindings/tests/sample_service.mojom',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [