Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(766)

Unified Diff: mojo/edk/mojo_edk_system_impl.gypi

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/mojo_edk.gni ('k') | mojo/edk/mojo_edk_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/mojo_edk_system_impl.gypi
diff --git a/mojo/edk/mojo_edk_system_impl.gypi b/mojo/edk/mojo_edk_system_impl.gypi
index a0af387b63b20fc7e296ffb81f21ba96c9b2f9d8..bab747b7b33c55f781fd18c42b8e73c9aa215944 100644
--- a/mojo/edk/mojo_edk_system_impl.gypi
+++ b/mojo/edk/mojo_edk_system_impl.gypi
@@ -37,10 +37,14 @@
'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',
@@ -64,6 +68,8 @@
'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',
@@ -102,8 +108,6 @@
'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
@@ -115,4 +119,11 @@
# 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 - mo
+ ['OS=="android"', {
+ "dependencies": [
+ "<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem",
+ ],
+ }],
+ ],
}
« no previous file with comments | « mojo/edk/mojo_edk.gni ('k') | mojo/edk/mojo_edk_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698