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

Side by Side Diff: components/nacl_nonsfi.gyp

Issue 649183005: Non-SFI Mode: Build gpu/ libraries by PNaCl toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
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',
(...skipping 23 matching lines...) Expand all
34 34
35 'sources': [ 35 'sources': [
36 'nacl/loader/nacl_helper_linux.cc', 36 'nacl/loader/nacl_helper_linux.cc',
37 'nacl/loader/nacl_helper_linux.h', 37 'nacl/loader/nacl_helper_linux.h',
38 ], 38 ],
39 39
40 'conditions': [ 40 'conditions': [
41 ['target_arch=="ia32" or target_arch=="x64"', { 41 ['target_arch=="ia32" or target_arch=="x64"', {
42 'extra_deps_newlib32_nonsfi': [ 42 'extra_deps_newlib32_nonsfi': [
43 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', 43 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
44 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a ',
45 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a ',
44 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a', 46 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
47 '>(tc_lib_dir_nonsfi_helper32)/libgles2_cmd_helper_nacl.a',
48 '>(tc_lib_dir_nonsfi_helper32)/libgles2_implementation_nacl.a' ,
49 '>(tc_lib_dir_nonsfi_helper32)/libgles2_utils_nacl.a',
50 '>(tc_lib_dir_nonsfi_helper32)/libgpu_ipc_nacl.a',
45 ], 51 ],
46 }], 52 }],
47 ], 53 ],
48 }, 54 },
49 'dependencies': [ 55 'dependencies': [
50 '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi', 56 '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi',
51 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', 57 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
52 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' , 58 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' ,
53 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 59 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
60
61 # Temporary depends on some libraries to make sure they can be
Mark Seaborn 2014/10/20 15:43:59 Nit: "Temporarily"
hidehiko 2014/10/20 19:02:34 Done.
62 # built properly. These are depended by PPAPI library.
63 # TODO(hidehiko): Remove them when PPAPI library is introduced.
64 '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
65 '../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
66 '../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
67 '../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
68 '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
69 '../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
54 ], 70 ],
55 }, 71 },
56 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests. 72 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.
57 ], 73 ],
58 }], 74 }],
59 ], 75 ],
60 } 76 }
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/command_buffer_nacl.gyp » ('j') | gpu/command_buffer/command_buffer_nacl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698