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

Side by Side Diff: third_party/mojo/mojo_edk_system_impl.gypi

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep permission service alive if embedder drops requests Created 5 years, 9 months 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # The dictionary here is defined for use by the "mojo_system_impl" and 5 # The dictionary here is defined for use by the "mojo_system_impl" and
6 # "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's define d in this 6 # "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's define d in this
7 # .gypi file so the sections aren't duplicated. 7 # .gypi file so the sections aren't duplicated.
8 { 8 {
9 'defines': [ 9 'defines': [
10 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 10 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'src/mojo/edk/system/channel_endpoint.h', 51 'src/mojo/edk/system/channel_endpoint.h',
52 'src/mojo/edk/system/channel_endpoint_client.h', 52 'src/mojo/edk/system/channel_endpoint_client.h',
53 'src/mojo/edk/system/channel_endpoint_id.cc', 53 'src/mojo/edk/system/channel_endpoint_id.cc',
54 'src/mojo/edk/system/channel_endpoint_id.h', 54 'src/mojo/edk/system/channel_endpoint_id.h',
55 'src/mojo/edk/system/channel_info.cc', 55 'src/mojo/edk/system/channel_info.cc',
56 'src/mojo/edk/system/channel_info.h', 56 'src/mojo/edk/system/channel_info.h',
57 'src/mojo/edk/system/channel_manager.cc', 57 'src/mojo/edk/system/channel_manager.cc',
58 'src/mojo/edk/system/channel_manager.h', 58 'src/mojo/edk/system/channel_manager.h',
59 'src/mojo/edk/system/configuration.cc', 59 'src/mojo/edk/system/configuration.cc',
60 'src/mojo/edk/system/configuration.h', 60 'src/mojo/edk/system/configuration.h',
61 'src/mojo/edk/system/connection_manager.cc',
62 'src/mojo/edk/system/connection_manager.h',
61 'src/mojo/edk/system/core.cc', 63 'src/mojo/edk/system/core.cc',
62 'src/mojo/edk/system/core.h', 64 'src/mojo/edk/system/core.h',
63 'src/mojo/edk/system/data_pipe.cc', 65 'src/mojo/edk/system/data_pipe.cc',
64 'src/mojo/edk/system/data_pipe.h', 66 'src/mojo/edk/system/data_pipe.h',
67 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
68 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
65 'src/mojo/edk/system/data_pipe_impl.cc', 69 'src/mojo/edk/system/data_pipe_impl.cc',
66 'src/mojo/edk/system/data_pipe_impl.h', 70 'src/mojo/edk/system/data_pipe_impl.h',
67 'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
68 'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
69 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc', 71 'src/mojo/edk/system/data_pipe_producer_dispatcher.cc',
70 'src/mojo/edk/system/data_pipe_producer_dispatcher.h', 72 'src/mojo/edk/system/data_pipe_producer_dispatcher.h',
71 'src/mojo/edk/system/dispatcher.cc', 73 'src/mojo/edk/system/dispatcher.cc',
72 'src/mojo/edk/system/dispatcher.h', 74 'src/mojo/edk/system/dispatcher.h',
73 'src/mojo/edk/system/endpoint_relayer.cc', 75 'src/mojo/edk/system/endpoint_relayer.cc',
74 'src/mojo/edk/system/endpoint_relayer.h', 76 'src/mojo/edk/system/endpoint_relayer.h',
75 'src/mojo/edk/system/handle_signals_state.h', 77 'src/mojo/edk/system/handle_signals_state.h',
76 'src/mojo/edk/system/handle_table.cc', 78 'src/mojo/edk/system/handle_table.cc',
77 'src/mojo/edk/system/handle_table.h', 79 'src/mojo/edk/system/handle_table.h',
78 'src/mojo/edk/system/incoming_endpoint.cc', 80 'src/mojo/edk/system/incoming_endpoint.cc',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'defines': ['MOJO_USE_SYSTEM_IMPL'], 137 'defines': ['MOJO_USE_SYSTEM_IMPL'],
136 }, 138 },
137 'conditions': [ 139 'conditions': [
138 ['OS=="android"', { 140 ['OS=="android"', {
139 'dependencies': [ 141 'dependencies': [
140 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem', 142 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
141 ], 143 ],
142 }], 144 }],
143 ], 145 ],
144 } 146 }
OLDNEW
« no previous file with comments | « content/browser/presentation/presentation_service_impl_unittest.cc ('k') | third_party/mojo/mojo_edk_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698