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

Side by Side Diff: testing/gtest_nacl.gyp

Issue 1145593002: Revert of Non-SFI mode: Build nacl_helper_nonsfi_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « sandbox/sandbox_nacl_nonsfi.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
11 'gtest.gypi', 11 'gtest.gypi',
12 ], 12 ],
13 'conditions': [ 13 'conditions': [
14 ['disable_nacl==0 and disable_nacl_untrusted==0', { 14 ['disable_nacl==0 and disable_nacl_untrusted==0', {
15 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'gtest_nacl', 17 'target_name': 'gtest_nacl',
18 'type': 'none', 18 'type': 'none',
19 'variables': { 19 'variables': {
20 'nlib_target': 'libgtest_nacl.a', 20 'nlib_target': 'libgtest_nacl.a',
21 'build_glibc': 0, 21 'build_glibc': 0,
22 'build_newlib': 0, 22 'build_newlib': 0,
23 'build_irt': 0,
24 'build_pnacl_newlib': 1, 23 'build_pnacl_newlib': 1,
25 'build_nonsfi_helper': 1,
26 }, 24 },
27 'sources': [ 25 'sources': [
28 '<@(gtest_sources)', 26 '<@(gtest_sources)',
29 ], 27 ],
30 'include_dirs': [ 28 'include_dirs': [
31 'gtest', 29 'gtest',
32 'gtest/include', 30 'gtest/include',
33 ], 31 ],
34 'defines': [ 32 'defines': [
35 # In order to allow regex matches in gtest to be shared between 33 # In order to allow regex matches in gtest to be shared between
(...skipping 29 matching lines...) Expand all
65 ], 63 ],
66 }, 64 },
67 }, 65 },
68 { 66 {
69 'target_name': 'gtest_main_nacl', 67 'target_name': 'gtest_main_nacl',
70 'type': 'none', 68 'type': 'none',
71 'variables': { 69 'variables': {
72 'nlib_target': 'libgtest_main_nacl.a', 70 'nlib_target': 'libgtest_main_nacl.a',
73 'build_glibc': 0, 71 'build_glibc': 0,
74 'build_newlib': 0, 72 'build_newlib': 0,
75 'build_irt': 0,
76 'build_pnacl_newlib': 1, 73 'build_pnacl_newlib': 1,
77 'build_nonsfi_helper': 1,
78 }, 74 },
79 'dependencies': [ 75 'dependencies': [
80 'gtest_nacl', 76 'gtest_nacl',
81 ], 77 ],
82 'sources': [ 78 'sources': [
83 'gtest/src/gtest_main.cc', 79 'gtest/src/gtest_main.cc',
84 ], 80 ],
85 'all_dependent_settings': { 81 'all_dependent_settings': {
86 'link_flags': [ 82 'link_flags': [
87 '-lgtest_main_nacl', 83 '-lgtest_main_nacl',
88 ], 84 ],
89 }, 85 },
90 }, 86 },
91 ], 87 ],
92 }], 88 }],
93 ], 89 ],
94 } 90 }
OLDNEW
« no previous file with comments | « sandbox/sandbox_nacl_nonsfi.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698