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

Side by Side Diff: gpu/command_buffer/command_buffer_nacl.gyp

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/cmd_buffer_functions.txt ('k') | gpu/command_buffer/common/capabilities.h » ('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 }, 8 },
9 'includes': [ 9 'includes': [
10 '../../build/common_untrusted.gypi', 10 '../../build/common_untrusted.gypi',
11 'command_buffer.gypi', 11 'command_buffer.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': 'gles2_utils_nacl', 17 'target_name': 'gles2_utils_nacl',
18 'type': 'none', 18 'type': 'none',
19 'variables': { 19 'variables': {
20 'gles2_utils_target': 1, 20 'gles2_utils_target': 1,
21 'nacl_untrusted_build': 1, 21 'nacl_untrusted_build': 1,
22 'nlib_target': 'libgles2_utils_nacl.a', 22 'nlib_target': 'libgles2_utils_nacl.a',
23 'build_glibc': 0, 23 'build_glibc': 0,
24 'build_newlib': 0, 24 'build_newlib': 0,
25 'build_irt': 1, 25 'build_irt': 1,
26 'build_pnacl_newlib': 0,
27 'build_nonsfi_helper': 1,
26 }, 28 },
27 'dependencies': [ 29 'dependencies': [
28 '../../native_client/tools.gyp:prep_toolchain', 30 '../../native_client/tools.gyp:prep_toolchain',
29 '../../base/base_nacl.gyp:base_nacl', 31 '../../base/base_nacl.gyp:base_nacl',
32 '../../base/base_nacl.gyp:base_nacl_nonsfi',
30 '../../third_party/khronos/khronos.gyp:khronos_headers', 33 '../../third_party/khronos/khronos.gyp:khronos_headers',
31 ], 34 ],
32 }, 35 },
33 ], 36 ],
34 }], 37 }],
35 ], 38 ],
36 } 39 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/cmd_buffer_functions.txt ('k') | gpu/command_buffer/common/capabilities.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698