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

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

Issue 8510068: Using path in SHARED_INTERMEDIATE_DIR rather than PRODUCT_DIR to be consistent with (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « no previous file | 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 (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 'conditions': [ 9 'conditions': [
10 ['disable_nacl!=1', { 10 ['disable_nacl!=1', {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 '-lm', 55 '-lm',
56 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 56 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
57 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', 57 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
58 ], 58 ],
59 'sources': [ 59 'sources': [
60 ], 60 ],
61 'extra_args': [ 61 'extra_args': [
62 '--strip-debug', 62 '--strip-debug',
63 ], 63 ],
64 'extra_deps64': [ 64 'extra_deps64': [
65 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppruntime.a', 65 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a',
66 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libirt_browser.a', 66 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
67 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libsrpc.a', 67 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a',
68 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libplatform.a', 68 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a',
69 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libimc_syscalls.a', 69 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a',
70 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libgio.a', 70 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a',
71 ], 71 ],
72 'extra_deps32': [ 72 'extra_deps32': [
73 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppruntime.a', 73 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a',
74 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libirt_browser.a', 74 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
75 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libsrpc.a', 75 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
76 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libplatform.a', 76 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
77 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libimc_syscalls.a', 77 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
78 '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libgio.a', 78 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
79 ], 79 ],
80 }, 80 },
81 'dependencies': [ 81 'dependencies': [
82 'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib', 82 'src/shared/ppapi_proxy/ppapi_proxy.gyp:ppruntime_lib',
83 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 83 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
84 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 84 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
85 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 85 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
86 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 86 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
87 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 87 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
88 ], 88 ],
89 }, 89 },
90 ], 90 ],
91 }], 91 }],
92 ], 92 ],
93 } 93 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698