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

Side by Side Diff: gpu/gpu_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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 | « gpu/command_buffer/command_buffer_nacl.gyp ('k') | ipc/ipc_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) 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # nacl_win64_target is for building the trusted Win64 NaCl broker. 8 # nacl_win64_target is for building the trusted Win64 NaCl broker.
9 'nacl_win64_target': 0, 9 'nacl_win64_target': 0,
10 }, 10 },
(...skipping 18 matching lines...) Expand all
29 }, 29 },
30 'defines': [ 30 'defines': [
31 'GLES2_IMPL_IMPLEMENTATION', 31 'GLES2_IMPL_IMPLEMENTATION',
32 ], 32 ],
33 'sources': [ 33 'sources': [
34 '<@(gles2_implementation_source_files)', 34 '<@(gles2_implementation_source_files)',
35 ], 35 ],
36 'dependencies': [ 36 'dependencies': [
37 '../base/base_nacl.gyp:base_nacl', 37 '../base/base_nacl.gyp:base_nacl',
38 '../base/base_nacl.gyp:base_nacl_nonsfi', 38 '../base/base_nacl.gyp:base_nacl_nonsfi',
39 '../native_client/tools.gyp:prep_toolchain',
40 '../third_party/khronos/khronos.gyp:khronos_headers', 39 '../third_party/khronos/khronos.gyp:khronos_headers',
41 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 40 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
42 'gles2_cmd_helper_nacl', 41 'gles2_cmd_helper_nacl',
43 ], 42 ],
44 }, 43 },
45 { 44 {
46 'target_name': 'command_buffer_common_nacl', 45 'target_name': 'command_buffer_common_nacl',
47 'type': 'none', 46 'type': 'none',
48 'variables': { 47 'variables': {
49 'nacl_untrusted_build': 1, 48 'nacl_untrusted_build': 1,
50 'nlib_target': 'libcommand_buffer_common_nacl.a', 49 'nlib_target': 'libcommand_buffer_common_nacl.a',
51 'build_glibc': 0, 50 'build_glibc': 0,
52 'build_newlib': 0, 51 'build_newlib': 0,
53 'build_irt': 1, 52 'build_irt': 1,
54 'build_pnacl_newlib': 0, 53 'build_pnacl_newlib': 0,
55 'build_nonsfi_helper': 1, 54 'build_nonsfi_helper': 1,
56 }, 55 },
57 'includes': [ 56 'includes': [
58 'command_buffer_common.gypi', 57 'command_buffer_common.gypi',
59 ], 58 ],
60 'dependencies': [ 59 'dependencies': [
61 '../base/base_nacl.gyp:base_nacl', 60 '../base/base_nacl.gyp:base_nacl',
62 '../base/base_nacl.gyp:base_nacl_nonsfi', 61 '../base/base_nacl.gyp:base_nacl_nonsfi',
63 '../native_client/tools.gyp:prep_toolchain',
64 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 62 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
65 ], 63 ],
66 }, 64 },
67 { 65 {
68 'target_name': 'gles2_cmd_helper_nacl', 66 'target_name': 'gles2_cmd_helper_nacl',
69 'type': 'none', 67 'type': 'none',
70 'variables': { 68 'variables': {
71 'nacl_untrusted_build': 1, 69 'nacl_untrusted_build': 1,
72 'nlib_target': 'libgles2_cmd_helper_nacl.a', 70 'nlib_target': 'libgles2_cmd_helper_nacl.a',
73 'build_glibc': 0, 71 'build_glibc': 0,
74 'build_newlib': 0, 72 'build_newlib': 0,
75 'build_irt': 1, 73 'build_irt': 1,
76 'build_pnacl_newlib': 0, 74 'build_pnacl_newlib': 0,
77 'build_nonsfi_helper': 1, 75 'build_nonsfi_helper': 1,
78 }, 76 },
79 'includes': [ 77 'includes': [
80 'gles2_cmd_helper.gypi', 78 'gles2_cmd_helper.gypi',
81 ], 79 ],
82 'dependencies': [ 80 'dependencies': [
83 '../base/base_nacl.gyp:base_nacl', 81 '../base/base_nacl.gyp:base_nacl',
84 '../base/base_nacl.gyp:base_nacl_nonsfi', 82 '../base/base_nacl.gyp:base_nacl_nonsfi',
85 '../native_client/tools.gyp:prep_toolchain',
86 'command_buffer_client_nacl', 83 'command_buffer_client_nacl',
87 ], 84 ],
88 }, 85 },
89 { 86 {
90 'target_name': 'command_buffer_client_nacl', 87 'target_name': 'command_buffer_client_nacl',
91 'type': 'none', 88 'type': 'none',
92 'variables': { 89 'variables': {
93 'nacl_untrusted_build': 1, 90 'nacl_untrusted_build': 1,
94 'nlib_target': 'libcommand_buffer_client_nacl.a', 91 'nlib_target': 'libcommand_buffer_client_nacl.a',
95 'build_glibc': 0, 92 'build_glibc': 0,
96 'build_newlib': 0, 93 'build_newlib': 0,
97 'build_irt': 1, 94 'build_irt': 1,
98 'build_pnacl_newlib': 0, 95 'build_pnacl_newlib': 0,
99 'build_nonsfi_helper': 1, 96 'build_nonsfi_helper': 1,
100 }, 97 },
101 'includes': [ 98 'includes': [
102 'command_buffer_client.gypi', 99 'command_buffer_client.gypi',
103 ], 100 ],
104 'dependencies': [ 101 'dependencies': [
105 '../base/base_nacl.gyp:base_nacl', 102 '../base/base_nacl.gyp:base_nacl',
106 '../base/base_nacl.gyp:base_nacl_nonsfi', 103 '../base/base_nacl.gyp:base_nacl_nonsfi',
107 '../native_client/tools.gyp:prep_toolchain',
108 'command_buffer_common_nacl', 104 'command_buffer_common_nacl',
109 ], 105 ],
110 }, 106 },
111 { 107 {
112 'target_name': 'gpu_ipc_nacl', 108 'target_name': 'gpu_ipc_nacl',
113 'type': 'none', 109 'type': 'none',
114 'variables': { 110 'variables': {
115 'nacl_untrusted_build': 1, 111 'nacl_untrusted_build': 1,
116 'nlib_target': 'libgpu_ipc_nacl.a', 112 'nlib_target': 'libgpu_ipc_nacl.a',
117 'build_glibc': 0, 113 'build_glibc': 0,
118 'build_newlib': 0, 114 'build_newlib': 0,
119 'build_irt': 1, 115 'build_irt': 1,
120 'build_pnacl_newlib': 0, 116 'build_pnacl_newlib': 0,
121 'build_nonsfi_helper': 1, 117 'build_nonsfi_helper': 1,
122 }, 118 },
123 'includes': [ 119 'includes': [
124 'gpu_ipc.gypi', 120 'gpu_ipc.gypi',
125 ], 121 ],
126 'dependencies': [ 122 'dependencies': [
127 '../base/base_nacl.gyp:base_nacl', 123 '../base/base_nacl.gyp:base_nacl',
128 '../base/base_nacl.gyp:base_nacl_nonsfi', 124 '../base/base_nacl.gyp:base_nacl_nonsfi',
129 '../native_client/tools.gyp:prep_toolchain',
130 'command_buffer_common_nacl', 125 'command_buffer_common_nacl',
131 ], 126 ],
132 }, 127 },
133 ], 128 ],
134 }], 129 }],
135 ], 130 ],
136 } 131 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/command_buffer_nacl.gyp ('k') | ipc/ipc_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698