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

Side by Side Diff: ppapi/ppapi_untrusted.gyp

Issue 10912175: Revert 155693 - DEPS roll plus copy list update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # This GYP file defines untrusted (NaCl) targets. All targets in this 5 # This GYP file defines untrusted (NaCl) targets. All targets in this
6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid
7 # requiring NaCl sources for building. 7 # requiring NaCl sources for building.
8 8
9 { 9 {
10 'includes': [ 10 'includes': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 ], 47 ],
48 'nexe_target': 'ppapi_nacl_tests', 48 'nexe_target': 'ppapi_nacl_tests',
49 'build_newlib': 1, 49 'build_newlib': 1,
50 'include_dirs': [ 50 'include_dirs': [
51 'lib/gl/include', 51 'lib/gl/include',
52 '..', 52 '..',
53 ], 53 ],
54 'link_flags': [ 54 'link_flags': [
55 '-lppapi_cpp', 55 '-lppapi_cpp',
56 '-lppapi', 56 '-lppapi',
57 '-lplatform',
57 '-lpthread', 58 '-lpthread',
59 '-lgio',
58 ], 60 ],
59 # TODO(bradchen): get rid of extra_deps64 and extra_deps32 61 # TODO(bradchen): get rid of extra_deps64 and extra_deps32
60 # once native_client/build/untrusted.gypi no longer needs them. 62 # once native_client/build/untrusted.gypi no longer needs them.
61 'extra_deps64': [ 63 'extra_deps64': [
62 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a', 64 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
63 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a', 65 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
64 ], 66 ],
65 'extra_deps_newlib64': [ 67 'extra_deps_newlib64': [
66 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a', 68 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
67 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a', 69 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 '--stage-dependencies=<(PRODUCT_DIR)', 126 '--stage-dependencies=<(PRODUCT_DIR)',
125 '--toolchain=glibc', 127 '--toolchain=glibc',
126 ], 128 ],
127 }, 129 },
128 ], 130 ],
129 }], 131 }],
130 ], 132 ],
131 }, 133 },
132 ], 134 ],
133 } 135 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698