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

Side by Side Diff: mojo/mojo_nacl.gyp

Issue 912503003: Remove "nacl_defines" from the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « components/nacl/nacl_defines.gypi ('k') | mojo/mojo_nacl_untrusted.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 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 'conditions': [ 6 'conditions': [
7 ['disable_nacl==0 and disable_nacl_untrusted==0', { 7 ['disable_nacl==0 and disable_nacl_untrusted==0', {
8 'includes': [ 8 'includes': [
9 '../components/nacl/nacl_defines.gypi',
10 '../mojo/mojo_nacl.gypi', 9 '../mojo/mojo_nacl.gypi',
11 ], 10 ],
12 'targets': [ 11 'targets': [
13 { 12 {
14 'target_name': 'monacl_codegen', 13 'target_name': 'monacl_codegen',
15 'type': 'none', 14 'type': 'none',
16 'actions': [ 15 'actions': [
17 { 16 {
18 'action_name': 'generate_nacl_bindings', 17 'action_name': 'generate_nacl_bindings',
19 'inputs': [ 18 'inputs': [
(...skipping 11 matching lines...) Expand all
31 'python', 30 'python',
32 'nacl/generator/generate_nacl_bindings.py', 31 'nacl/generator/generate_nacl_bindings.py',
33 '-d', '<(monacl_codegen_dir)', 32 '-d', '<(monacl_codegen_dir)',
34 ], 33 ],
35 }, 34 },
36 ], 35 ],
37 }, 36 },
38 { 37 {
39 'target_name': 'monacl_syscall', 38 'target_name': 'monacl_syscall',
40 'type': 'static_library', 39 'type': 'static_library',
41 'defines': [
42 '<@(nacl_defines)',
43 ],
44 'include_dirs': [ 40 'include_dirs': [
45 '..', 41 '..',
46 ], 42 ],
47 'sources': [ 43 'sources': [
48 '<(monacl_codegen_dir)/mojo_syscall.cc', 44 '<(monacl_codegen_dir)/mojo_syscall.cc',
49 ], 45 ],
50 'dependencies': [ 46 'dependencies': [
51 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', 47 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
52 ], 48 ],
53 }, 49 },
54 { 50 {
55 'target_name': 'monacl_sel', 51 'target_name': 'monacl_sel',
56 'type': 'static_library', 52 'type': 'static_library',
57 'defines': [
58 '<@(nacl_defines)',
59 ],
60 'include_dirs': [ 53 'include_dirs': [
61 '..', 54 '..',
62 ], 55 ],
63 'sources': [ 56 'sources': [
64 'nacl/monacl_sel_main.cc', 57 'nacl/monacl_sel_main.cc',
65 ], 58 ],
66 'dependencies': [ 59 'dependencies': [
67 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel', 60 '<(DEPTH)/native_client/src/trusted/service_runtime/service_runtime. gyp:sel',
68 'monacl_codegen', 61 'monacl_codegen',
69 'monacl_syscall', 62 'monacl_syscall',
(...skipping 11 matching lines...) Expand all
81 'nacl/monacl_shell.cc', 74 'nacl/monacl_shell.cc',
82 ], 75 ],
83 }, 76 },
84 ], 77 ],
85 'conditions': [ 78 'conditions': [
86 ['OS=="win" and target_arch=="ia32"', { 79 ['OS=="win" and target_arch=="ia32"', {
87 'targets': [ 80 'targets': [
88 { 81 {
89 'target_name': 'monacl_syscall_win64', 82 'target_name': 'monacl_syscall_win64',
90 'type': 'static_library', 83 'type': 'static_library',
91 'defines': [
92 '<@(nacl_defines)',
93 ],
94 'include_dirs': [ 84 'include_dirs': [
95 '..', 85 '..',
96 ], 86 ],
97 'sources': [ 87 'sources': [
98 '<(monacl_codegen_dir)/mojo_syscall.cc', 88 '<(monacl_codegen_dir)/mojo_syscall.cc',
99 ], 89 ],
100 'dependencies': [ 90 'dependencies': [
101 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', 91 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
102 ], 92 ],
103 'configurations': { 93 'configurations': {
104 'Common_Base': { 94 'Common_Base': {
105 'msvs_target_platform': 'x64', 95 'msvs_target_platform': 'x64',
106 } 96 }
107 }, 97 },
108 }, 98 },
109 ], 99 ],
110 }], 100 }],
111 ], 101 ],
112 }], 102 }],
113 ], 103 ],
114 } 104 }
OLDNEW
« no previous file with comments | « components/nacl/nacl_defines.gypi ('k') | mojo/mojo_nacl_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698