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

Side by Side Diff: ppapi/ppapi_nacl_test_common.gypi

Issue 1332163005: nacl: Be more consistent about setting nacl_untrusted_build on targets that use untrusted.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « ppapi/ppapi_nacl.gyp ('k') | third_party/libjingle/libjingle_nacl.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 '../build/common_untrusted.gypi', 7 '../build/common_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
11 # target_condition block because the target_condition block in 11 # target_condition block because the target_condition block in
12 # untrusted gypi is fully evaluated and interpolated before any of the 12 # untrusted gypi is fully evaluated and interpolated before any of the
13 # target_condition blocks in this file are expanded. This means that any 13 # target_condition blocks in this file are expanded. This means that any
14 # variables overriden inside a target_condition block in this file will not 14 # variables overriden inside a target_condition block in this file will not
15 # affect the values in untrusted.gypi. 15 # affect the values in untrusted.gypi.
16 'variables': { 16 'variables': {
17 'nacl_untrusted_build': 1,
Nico 2015/09/15 01:01:20 (seems like every target including this gypi proba
bradnelson 2015/09/15 01:25:16 Not sure. There may be places where not every targ
17 'test_files': [], 18 'test_files': [],
18 'generate_nmf%': 1, 19 'generate_nmf%': 1,
19 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib', 20 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib',
20 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc', 21 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc',
21 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl ', 22 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl ',
22 'nacl_pnacl_newlib_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir )/nonsfi', 23 'nacl_pnacl_newlib_nonsfi_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir )/nonsfi',
23 'target_conditions': [ 24 'target_conditions': [
24 ['nexe_target!=""', { 25 ['nexe_target!=""', {
25 # These variables are used for nexe building and for library building. 26 # These variables are used for nexe building and for library building.
26 'out_newlib32%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32. nexe', 27 'out_newlib32%': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32. nexe',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 }], 259 }],
259 ], 260 ],
260 }, 261 },
261 ], 262 ],
262 }], 263 }],
263 ], 264 ],
264 }], 265 }],
265 ], 266 ],
266 }, 267 },
267 } 268 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_nacl.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698