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

Side by Side Diff: mojo/mojo_edk_system_impl.gypi

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 5 years, 11 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
« no previous file with comments | « mojo/edk/test/test_support_impl.cc ('k') | mojo/public/VERSION » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 mojo/mojo_edk.gyp. It's defined in this 6 # "mojo_system_impl_win64" targets in mojo/mojo_edk.gyp. It's defined 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 27 matching lines...) Expand all
38 'edk/embedder/simple_platform_shared_buffer.cc', 38 'edk/embedder/simple_platform_shared_buffer.cc',
39 'edk/embedder/simple_platform_shared_buffer.h', 39 'edk/embedder/simple_platform_shared_buffer.h',
40 'edk/embedder/simple_platform_shared_buffer_android.cc', 40 'edk/embedder/simple_platform_shared_buffer_android.cc',
41 'edk/embedder/simple_platform_shared_buffer_posix.cc', 41 'edk/embedder/simple_platform_shared_buffer_posix.cc',
42 'edk/embedder/simple_platform_shared_buffer_win.cc', 42 'edk/embedder/simple_platform_shared_buffer_win.cc',
43 'edk/embedder/simple_platform_support.cc', 43 'edk/embedder/simple_platform_support.cc',
44 'edk/embedder/simple_platform_support.h', 44 'edk/embedder/simple_platform_support.h',
45 'edk/system/awakable.h', 45 'edk/system/awakable.h',
46 'edk/system/awakable_list.cc', 46 'edk/system/awakable_list.cc',
47 'edk/system/awakable_list.h', 47 'edk/system/awakable_list.h',
48 'edk/system/async_waiter.cc',
49 'edk/system/async_waiter.h',
48 'edk/system/channel.cc', 50 'edk/system/channel.cc',
49 'edk/system/channel.h', 51 'edk/system/channel.h',
50 'edk/system/channel_endpoint.cc', 52 'edk/system/channel_endpoint.cc',
51 'edk/system/channel_endpoint.h', 53 'edk/system/channel_endpoint.h',
52 'edk/system/channel_endpoint_client.h', 54 'edk/system/channel_endpoint_client.h',
53 'edk/system/channel_endpoint_id.cc', 55 'edk/system/channel_endpoint_id.cc',
54 'edk/system/channel_endpoint_id.h', 56 'edk/system/channel_endpoint_id.h',
55 'edk/system/channel_info.cc', 57 'edk/system/channel_info.cc',
56 'edk/system/channel_info.h', 58 'edk/system/channel_info.h',
57 'edk/system/channel_manager.cc', 59 'edk/system/channel_manager.cc',
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'defines': ['MOJO_USE_SYSTEM_IMPL'], 124 'defines': ['MOJO_USE_SYSTEM_IMPL'],
123 }, 125 },
124 'conditions': [ 126 'conditions': [
125 ['OS=="android"', { 127 ['OS=="android"', {
126 'dependencies': [ 128 'dependencies': [
127 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem', 129 '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
128 ], 130 ],
129 }], 131 }],
130 ], 132 ],
131 } 133 }
OLDNEW
« no previous file with comments | « mojo/edk/test/test_support_impl.cc ('k') | mojo/public/VERSION » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698