Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/edk/mojo_edk_system_impl.gypi

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # The dictionary here is defined for use by the "mojo_system_impl" and
 # "mojo_system_impl_win64" targets in mojo/edk/mojo_edk.gyp. It's defined in
 # this .gypi file so the sections aren't duplicated.
 {
   'defines': [
     'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
@@ skipping 19 matching lines @@
     'embedder/platform_handle.h',
     'embedder/platform_handle_utils.h',
     'embedder/platform_handle_utils_posix.cc',
     'embedder/platform_handle_utils_win.cc',
     'embedder/platform_handle_vector.h',
     'embedder/platform_shared_buffer.h',
     'embedder/platform_support.h',
     'embedder/scoped_platform_handle.h',
     'embedder/simple_platform_shared_buffer.cc',
     'embedder/simple_platform_shared_buffer.h',
+    'embedder/simple_platform_shared_buffer_android.cc',
     'embedder/simple_platform_shared_buffer_posix.cc',
     'embedder/simple_platform_shared_buffer_win.cc',
     'embedder/simple_platform_support.cc',
     'embedder/simple_platform_support.h',
+    'system/awakable.h',
+    'system/awakable_list.cc',
+    'system/awakable_list.h',
     'system/channel.cc',
     'system/channel.h',
     'system/channel_endpoint.cc',
     'system/channel_endpoint.h',
     'system/channel_endpoint_client.h',
     'system/channel_endpoint_id.cc',
     'system/channel_endpoint_id.h',
     'system/channel_info.cc',
     'system/channel_info.h',
     'system/channel_manager.cc',
     'system/channel_manager.h',
     'system/configuration.cc',
     'system/configuration.h',
     'system/core.cc',
     'system/core.h',
     'system/data_pipe.cc',
     'system/data_pipe.h',
     'system/data_pipe_consumer_dispatcher.cc',
     'system/data_pipe_consumer_dispatcher.h',
     'system/data_pipe_producer_dispatcher.cc',
     'system/data_pipe_producer_dispatcher.h',
     'system/dispatcher.cc',
     'system/dispatcher.h',
+    'system/endpoint_relayer.cc',
+    'system/endpoint_relayer.h',
     'system/handle_signals_state.h',
     'system/handle_table.cc',
     'system/handle_table.h',
     'system/local_data_pipe.cc',
     'system/local_data_pipe.h',
     'system/local_message_pipe_endpoint.cc',
     'system/local_message_pipe_endpoint.h',
     'system/mapping_table.cc',
     'system/mapping_table.h',
     'system/memory.cc',
@@ skipping 18 matching lines @@
     'system/raw_channel_posix.cc',
     'system/raw_channel_win.cc',
     'system/shared_buffer_dispatcher.cc',
     'system/shared_buffer_dispatcher.h',
     'system/simple_dispatcher.cc',
     'system/simple_dispatcher.h',
     'system/transport_data.cc',
     'system/transport_data.h',
     'system/waiter.cc',
     'system/waiter.h',
-    'system/waiter_list.cc',
-    'system/waiter_list.h',
     # Test-only code:
     # TODO(vtl): It's a little unfortunate that these end up in the same
     # component as non-test-only code. In the static build, this code
     # should hopefully be dead-stripped.
     'embedder/test_embedder.cc',
     'embedder/test_embedder.h',
   ],
   'all_dependent_settings': {
     # Ensures that dependent projects import the core functions on Windows.
     'defines': ['MOJO_USE_SYSTEM_IMPL'],
   },
+  'conditions': [

[jamesr, 2014/12/09 04:22:55]

i don't see what's strange or ugly about this -
mojo/edk/embedder/simple_platform_shared_buffer_android.cc uses ashmem so we
have to declare a dependency on it.  It's android-only because we only use it
from android specific files (and it's an android-only concept)

+    ['OS=="android"', {
+      "dependencies": [
+        "<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem",
+      ],
+    }],
+  ],
 }