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

Side by Side Diff: mojo/mojo_nacl.gyp

Issue 608613003: monacl: build_newlib -> build_pnacl_newlib. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | mojo/nacl/generator/libmojo.cc.tmpl » ('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 },
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 'sources': [ 67 'sources': [
68 'nacl/monacl_shell.cc', 68 'nacl/monacl_shell.cc',
69 ], 69 ],
70 }, 70 },
71 { 71 {
72 'target_name': 'mojo_nacl', 72 'target_name': 'mojo_nacl',
73 'type': 'none', 73 'type': 'none',
74 'variables': { 74 'variables': {
75 'nlib_target': 'libmojo.a', 75 'nlib_target': 'libmojo.a',
76 'build_glibc': 0, 76 'build_glibc': 0,
77 'build_newlib': 1, 77 'build_newlib': 0,
78 'build_pnacl_newlib': 0, 78 'build_pnacl_newlib': 1,
79 }, 79 },
80 'defines': [ 80 'defines': [
81 '<@(nacl_defines)', 81 '<@(nacl_defines)',
82 ], 82 ],
83 'sources': [ 83 'sources': [
84 '<(monacl_codegen_dir)/libmojo.cc', 84 '<(monacl_codegen_dir)/libmojo.cc',
85 ], 85 ],
86 'dependencies': [ 86 'dependencies': [
87 'monacl_codegen', 87 'monacl_codegen',
88 ], 88 ],
89 }, 89 },
90 { 90 {
91 'target_name': 'monacl_test', 91 'target_name': 'monacl_test',
92 'type': 'none', 92 'type': 'none',
93 'variables': { 93 'variables': {
94 'nexe_target': 'monacl_test', 94 'nexe_target': 'monacl_test',
95 'build_newlib': 1, 95 'build_newlib': 0,
96 'build_pnacl_newlib': 1,
97 'translate_pexe_with_build': 1,
96 'link_flags': [ 98 'link_flags': [
97 '-pthread', 99 '-pthread',
98 '-lmojo', 100 '-lmojo',
99 '-limc_syscalls', 101 '-limc_syscalls',
100 ], 102 ],
101 'sources': [ 103 'sources': [
102 '<@(mojo_public_system_unittest_sources)', 104 '<@(mojo_public_system_unittest_sources)',
103 ], 105 ],
104 }, 106 },
105 'dependencies': [ 107 'dependencies': [
106 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 108 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
107 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', 109 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
108 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib ', 110 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib ',
109 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li b', 111 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li b',
110 '../testing/gtest_nacl.gyp:gtest_nacl', 112 '../testing/gtest_nacl.gyp:gtest_nacl',
111 '../testing/gtest_nacl.gyp:gtest_main_nacl', 113 '../testing/gtest_nacl.gyp:gtest_main_nacl',
112 'mojo_nacl', 114 'mojo_nacl',
113 'monacl_codegen', 115 'monacl_codegen',
114 ], 116 ],
115 }, 117 },
116 ], 118 ],
117 }], 119 }],
118 ], 120 ],
119 } 121 }
OLDNEW
« no previous file with comments | « no previous file | mojo/nacl/generator/libmojo.cc.tmpl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698