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

Side by Side Diff: ppapi/native_client/native_client.gyp

Issue 8905007: Put irt and untrusted TC dependencies behind a flag. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/nacl.gypi ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 '../../native_client/build/common.gypi', 7 '../../native_client/build/common.gypi',
8 ], 8 ],
9 'targets': [],
noelallen_use_chromium 2011/12/12 22:16:30 This actually works? I could have used that.
9 'conditions': [ 10 'conditions': [
10 ['disable_nacl!=1', { 11 ['disable_nacl!=1 and disable_nacl_untrusted!=1', {
11 'targets': [ 12 'targets': [
12 { 13 {
13 'target_name': 'ppapi_lib', 14 'target_name': 'ppapi_lib',
14 'type': 'none', 15 'type': 'none',
15 'dependencies': [ 16 'dependencies': [
16 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib' , 17 '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib' ,
17 '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub _lib', 18 '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub _lib',
18 ], 19 ],
19 'copies': [ 20 'copies': [
20 { 21 {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'extra_deps32': [ 73 'extra_deps32': [
73 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a', 74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a',
74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a', 75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a', 76 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
76 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a', 77 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
77 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a', 78 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
78 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a', 79 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
79 ], 80 ],
80 }, 81 },
81 'dependencies': [ 82 'dependencies': [
82 'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib', 83 'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib',
83 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 84 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
84 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 85 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
85 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 86 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
86 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 87 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
87 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 88 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
88 ], 89 ],
89 }, 90 },
90 ], 91 ],
91 }], 92 }],
92 ], 93 ],
93 } 94 }
OLDNEW
« no previous file with comments | « chrome/nacl.gypi ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698