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

Side by Side Diff: third_party/mojo/mojo_edk.gyp

Issue 1309103002: Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « sql/mojo/sql_test_base.h ('k') | third_party/mojo/mojo_edk_system_impl.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'includes': [ 6 'includes': [
7 'mojo_variables.gypi', 7 'mojo_variables.gypi',
8 ], 8 ],
9 'target_defaults' : { 9 'target_defaults' : {
10 'include_dirs': [ 10 'include_dirs': [
11 'src', 11 'src',
12 ], 12 ],
13 'direct_dependent_settings': { 13 'direct_dependent_settings': {
14 'include_dirs': [ 14 'include_dirs': [
15 'src', 15 'src',
16 ], 16 ],
17 }, 17 },
18 }, 18 },
19 'targets': [ 19 'targets': [
20 { 20 {
21 # GN version: //mojo/edk/system 21 # GN version: //mojo/edk/system
22 'target_name': 'mojo_system_impl', 22 'target_name': 'mojo_system_impl',
23 'type': '<(component)', 23 'type': '<(component)',
24 'dependencies': [ 24 'dependencies': [
25 '../../base/base.gyp:base', 25 '../../base/base.gyp:base',
26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
27 '../../crypto/crypto.gyp:crypto',
27 ], 28 ],
28 'includes': [ 29 'includes': [
29 'mojo_edk_system_impl.gypi', 30 'mojo_edk_system_impl.gypi',
30 ], 31 ],
31 }, 32 },
32 { 33 {
33 # GN version: //mojo/edk/js 34 # GN version: //mojo/edk/js
34 'target_name': 'mojo_js_lib', 35 'target_name': 'mojo_js_lib',
35 'type': 'static_library', 36 'type': 'static_library',
36 'dependencies': [ 37 'dependencies': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 ], 134 ],
134 'conditions': [ 135 'conditions': [
135 ['OS=="win" and target_arch=="ia32"', { 136 ['OS=="win" and target_arch=="ia32"', {
136 'targets': [ 137 'targets': [
137 { 138 {
138 'target_name': 'mojo_system_impl_win64', 139 'target_name': 'mojo_system_impl_win64',
139 'type': '<(component)', 140 'type': '<(component)',
140 'dependencies': [ 141 'dependencies': [
141 '../../base/base.gyp:base_win64', 142 '../../base/base.gyp:base_win64',
142 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp: dynamic_annotations_win64', 143 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp: dynamic_annotations_win64',
144 '../../crypto/crypto.gyp:crypto_nacl_win64',
143 ], 145 ],
144 'includes': [ 146 'includes': [
145 'mojo_edk_system_impl.gypi', 147 'mojo_edk_system_impl.gypi',
146 ], 148 ],
147 'configurations': { 149 'configurations': {
148 'Common_Base': { 150 'Common_Base': {
149 'msvs_target_platform': 'x64', 151 'msvs_target_platform': 'x64',
150 }, 152 },
151 }, 153 },
152 }, 154 },
153 ], 155 ],
154 }], 156 }],
155 ], 157 ],
156 } 158 }
OLDNEW
« no previous file with comments | « sql/mojo/sql_test_base.h ('k') | third_party/mojo/mojo_edk_system_impl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698