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

Side by Side Diff: mojo/mojo_nacl_untrusted.gyp

Issue 881933004: Mojo+NaCl: Move generated code to mojo/nacl. (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 | « mojo/mojo_nacl.gypi ('k') | no next file » | 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': {
9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui ld/inverse_depth.py <(DEPTH))/monacl',
10 },
11 'includes': [ 8 'includes': [
12 '../build/common_untrusted.gypi', 9 '../build/common_untrusted.gypi',
13 '../components/nacl/nacl_defines.gypi', 10 '../components/nacl/nacl_defines.gypi',
11 '../mojo/mojo_nacl.gypi',
14 '../third_party/mojo/mojo_variables.gypi', 12 '../third_party/mojo/mojo_variables.gypi',
15 ], 13 ],
16 'targets': [ 14 'targets': [
17 { 15 {
18 'target_name': 'libmojo', 16 'target_name': 'libmojo',
19 'type': 'none', 17 'type': 'none',
20 'variables': { 18 'variables': {
21 'nlib_target': 'libmojo.a', 19 'nlib_target': 'libmojo.a',
22 'build_glibc': 0, 20 'build_glibc': 0,
23 'build_newlib': 0, 21 'build_newlib': 0,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 '../testing/gtest_nacl.gyp:gtest_nacl', 57 '../testing/gtest_nacl.gyp:gtest_nacl',
60 '../testing/gtest_nacl.gyp:gtest_main_nacl', 58 '../testing/gtest_nacl.gyp:gtest_main_nacl',
61 'libmojo', 59 'libmojo',
62 'mojo_nacl.gyp:monacl_codegen', 60 'mojo_nacl.gyp:monacl_codegen',
63 ], 61 ],
64 }, 62 },
65 ], 63 ],
66 }], 64 }],
67 ], 65 ],
68 } 66 }
OLDNEW
« no previous file with comments | « mojo/mojo_nacl.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698