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

Side by Side Diff: chrome/test/data/nacl/nacl_browser_test.gypi

Issue 11280063: Beginnings of moving more stuff from build_sdk.py to GYP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « build/all.gyp ('k') | native_client_sdk/src/build_tools/nacl_ppapi_sdk.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) 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 { 5 {
6 'includes': [ 6 'includes': [
7 '../../../../native_client/build/untrusted.gypi', 7 '../../../../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 # We need to override the variables in untrusted.gypi outside of a 10 # We need to override the variables in untrusted.gypi outside of a
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 # cases. 64 # cases.
65 'enable_x86_64%': 0, 65 'enable_x86_64%': 0,
66 'enable_x86_32%': 0, 66 'enable_x86_32%': 0,
67 'enable_arm%': 0, 67 'enable_arm%': 0,
68 'include_dirs': [ 68 'include_dirs': [
69 '<(DEPTH)', 69 '<(DEPTH)',
70 ], 70 ],
71 'link_flags': [ 71 'link_flags': [
72 '-lppapi_cpp', 72 '-lppapi_cpp',
73 '-lppapi', 73 '-lppapi',
74 '-lpthread', 74 '-pthread',
75 ], 75 ],
76 }, 76 },
77 'target_conditions': [ 77 'target_conditions': [
78 ['build_newlib==1', { 78 ['build_newlib==1', {
79 'actions': [ 79 'actions': [
80 { 80 {
81 'action_name': 'Generate NEWLIB NMF', 81 'action_name': 'Generate NEWLIB NMF',
82 # Unlike glibc, nexes are not actually inputs - only the names m atter. 82 # Unlike glibc, nexes are not actually inputs - only the names m atter.
83 # We don't have the nexes as inputs because the ARM nexe may not 83 # We don't have the nexes as inputs because the ARM nexe may not
84 # exist. However, VS 2010 seems to blackhole this entire target if 84 # exist. However, VS 2010 seems to blackhole this entire target if
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 # TODO(ncbray) handle arm case. We don't have ARM glibc yet. 151 # TODO(ncbray) handle arm case. We don't have ARM glibc yet.
152 ], 152 ],
153 }, 153 },
154 ], 154 ],
155 }], 155 }],
156 ], 156 ],
157 }], 157 }],
158 ], 158 ],
159 }, 159 },
160 } 160 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698