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

Side by Side Diff: mojo/mojo_edk.gyp

Issue 2084443002: Remove all mojo and IPC dependencies on dynamic annotations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/mojo_base.gyp ('k') | mojo/mojo_edk_nacl.gyp » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'mojo_edk.gypi', 10 'mojo_edk.gypi',
11 ], 11 ],
12 'target_defaults' : { 12 'target_defaults' : {
13 'include_dirs': [ 13 'include_dirs': [
14 '..', 14 '..',
15 ], 15 ],
16 'direct_dependent_settings': { 16 'direct_dependent_settings': {
17 'include_dirs': [ 17 'include_dirs': [
18 '..', 18 '..',
19 ], 19 ],
20 }, 20 },
21 }, 21 },
22 'targets': [ 22 'targets': [
23 { 23 {
24 # GN version: //mojo/edk/system/ports 24 # GN version: //mojo/edk/system/ports
25 'target_name': 'mojo_system_ports', 25 'target_name': 'mojo_system_ports',
26 'type': 'static_library', 26 'type': 'static_library',
27 'dependencies': [ 27 'dependencies': [
28 '../base/base.gyp:base', 28 '../base/base.gyp:base',
29 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
30 '../crypto/crypto.gyp:crypto', 29 '../crypto/crypto.gyp:crypto',
31 ], 30 ],
32 'sources': [ 31 'sources': [
33 '<@(mojo_edk_ports_sources)', 32 '<@(mojo_edk_ports_sources)',
34 ], 33 ],
35 }, 34 },
36 { 35 {
37 # GN version: //mojo/edk/system 36 # GN version: //mojo/edk/system
38 'target_name': 'mojo_system_impl', 37 'target_name': 'mojo_system_impl',
39 'type': '<(component)', 38 'type': '<(component)',
40 'dependencies': [ 39 'dependencies': [
41 '../base/base.gyp:base', 40 '../base/base.gyp:base',
42 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
43 '../crypto/crypto.gyp:crypto', 41 '../crypto/crypto.gyp:crypto',
44 'mojo_public.gyp:mojo_public_system', 42 'mojo_public.gyp:mojo_public_system',
45 'mojo_system_ports', 43 'mojo_system_ports',
46 ], 44 ],
47 'defines': [ 45 'defines': [
48 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 46 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
49 ], 47 ],
50 'sources': [ 48 'sources': [
51 '<@(mojo_edk_system_impl_sources)', 49 '<@(mojo_edk_system_impl_sources)',
52 '<@(mojo_edk_system_impl_non_nacl_sources)', 50 '<@(mojo_edk_system_impl_non_nacl_sources)',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 ], 178 ],
181 'conditions': [ 179 'conditions': [
182 ['OS == "win" and target_arch=="ia32"', { 180 ['OS == "win" and target_arch=="ia32"', {
183 'targets': [ 181 'targets': [
184 { 182 {
185 # GN version: //mojo/edk/system/ports 183 # GN version: //mojo/edk/system/ports
186 'target_name': 'mojo_system_ports_win64', 184 'target_name': 'mojo_system_ports_win64',
187 'type': 'static_library', 185 'type': 'static_library',
188 'dependencies': [ 186 'dependencies': [
189 '../base/base.gyp:base_win64', 187 '../base/base.gyp:base_win64',
190 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
191 '../crypto/crypto.gyp:crypto_nacl_win64', 188 '../crypto/crypto.gyp:crypto_nacl_win64',
192 ], 189 ],
193 'sources': [ 190 'sources': [
194 '<@(mojo_edk_ports_sources)', 191 '<@(mojo_edk_ports_sources)',
195 ], 192 ],
196 'configurations': { 193 'configurations': {
197 'Common_Base': { 194 'Common_Base': {
198 'msvs_target_platform': 'x64', 195 'msvs_target_platform': 'x64',
199 }, 196 },
200 }, 197 },
201 }, 198 },
202 { 199 {
203 # GN version: //mojo/edk/system 200 # GN version: //mojo/edk/system
204 'target_name': 'mojo_system_impl_win64', 201 'target_name': 'mojo_system_impl_win64',
205 'type': '<(component)', 202 'type': '<(component)',
206 'dependencies': [ 203 'dependencies': [
207 '../base/base.gyp:base_win64', 204 '../base/base.gyp:base_win64',
208 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
209 '../crypto/crypto.gyp:crypto_nacl_win64', 205 '../crypto/crypto.gyp:crypto_nacl_win64',
210 'mojo_public.gyp:mojo_public_system_win64', 206 'mojo_public.gyp:mojo_public_system_win64',
211 'mojo_system_ports_win64', 207 'mojo_system_ports_win64',
212 ], 208 ],
213 'defines': [ 209 'defines': [
214 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', 210 'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
215 ], 211 ],
216 'sources': [ 212 'sources': [
217 '<@(mojo_edk_system_impl_sources)', 213 '<@(mojo_edk_system_impl_sources)',
218 '<@(mojo_edk_system_impl_non_nacl_sources)', 214 '<@(mojo_edk_system_impl_non_nacl_sources)',
219 ], 215 ],
220 # Structure was padded due to __declspec(align()), which is 216 # Structure was padded due to __declspec(align()), which is
221 # uninteresting. 217 # uninteresting.
222 'msvs_disabled_warnings': [ 4324 ], 218 'msvs_disabled_warnings': [ 4324 ],
223 'configurations': { 219 'configurations': {
224 'Common_Base': { 220 'Common_Base': {
225 'msvs_target_platform': 'x64', 221 'msvs_target_platform': 'x64',
226 }, 222 },
227 }, 223 },
228 }, 224 },
229 ], 225 ],
230 }], 226 }],
231 ] 227 ]
232 } 228 }
OLDNEW
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/mojo_edk_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698