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

Side by Side Diff: mojo/mojo_nacl.gyp

Issue 826393003: Split mojo_nacl.gyp to fix ARM builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « build/all.gyp ('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 'variables': { 8 'variables': {
9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl', 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl',
10 }, 10 },
11 'includes': [ 11 'includes': [
12 'mojo_variables.gypi',
13 '../build/common_untrusted.gypi',
14 '../components/nacl/nacl_defines.gypi', 12 '../components/nacl/nacl_defines.gypi',
15 ], 13 ],
16 'targets': [ 14 'targets': [
17 { 15 {
18 'target_name': 'monacl_codegen', 16 'target_name': 'monacl_codegen',
19 'type': 'none', 17 'type': 'none',
20 'actions': [ 18 'actions': [
21 { 19 {
22 'action_name': 'generate_nacl_bindings', 20 'action_name': 'generate_nacl_bindings',
23 'inputs': [ 21 'inputs': [
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 'type': 'executable', 91 'type': 'executable',
94 'dependencies': [ 92 'dependencies': [
95 '../base/base.gyp:base', 93 '../base/base.gyp:base',
96 'mojo_edk.gyp:mojo_system_impl', 94 'mojo_edk.gyp:mojo_system_impl',
97 'monacl_sel', 95 'monacl_sel',
98 ], 96 ],
99 'sources': [ 97 'sources': [
100 'nacl/monacl_shell.cc', 98 'nacl/monacl_shell.cc',
101 ], 99 ],
102 }, 100 },
103 {
104 'target_name': 'mojo_nacl',
105 'type': 'none',
106 'variables': {
107 'nlib_target': 'libmojo.a',
108 'build_glibc': 0,
109 'build_newlib': 0,
110 'build_pnacl_newlib': 1,
111 },
112 'defines': [
113 '<@(nacl_defines)',
114 ],
115 'sources': [
116 '<(monacl_codegen_dir)/libmojo.cc',
117 ],
118 'dependencies': [
119 'monacl_codegen',
120 ],
121 },
122 {
123 'target_name': 'monacl_test',
124 'type': 'none',
125 'variables': {
126 'nexe_target': 'monacl_test',
127 'build_newlib': 0,
128 'build_pnacl_newlib': 1,
129 'translate_pexe_with_build': 1,
130 'link_flags': [
131 '-pthread',
132 '-lmojo',
133 '-limc_syscalls',
134 ],
135 'sources': [
136 '<@(mojo_public_system_unittest_sources)',
137 ],
138 },
139 'dependencies': [
140 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
141 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
142 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib ',
143 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li b',
144 '../testing/gtest_nacl.gyp:gtest_nacl',
145 '../testing/gtest_nacl.gyp:gtest_main_nacl',
146 'mojo_nacl',
147 'monacl_codegen',
148 ],
149 },
150 ], 101 ],
151 }], 102 }],
152 ], 103 ],
153 } 104 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | mojo/mojo_nacl_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698