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

Side by Side Diff: components/nacl_nonsfi.gyp

Issue 933993002: NaCl: Update revision in DEPS, badad9a -> 6b9d8cf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with adjustment Created 5 years, 10 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 | « DEPS ('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',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'nacl/common/nacl_messages.cc', 51 'nacl/common/nacl_messages.cc',
52 'nacl/common/nacl_types.cc', 52 'nacl/common/nacl_types.cc',
53 'nacl/common/nacl_types_param_traits.cc', 53 'nacl/common/nacl_types_param_traits.cc',
54 'nacl/loader/nacl_helper_linux.cc', 54 'nacl/loader/nacl_helper_linux.cc',
55 'nacl/loader/nacl_trusted_listener.cc', 55 'nacl/loader/nacl_trusted_listener.cc',
56 'nacl/loader/nonsfi/nonsfi_listener.cc', 56 'nacl/loader/nonsfi/nonsfi_listener.cc',
57 'nacl/loader/nonsfi/nonsfi_main.cc', 57 'nacl/loader/nonsfi/nonsfi_main.cc',
58 ], 58 ],
59 59
60 'link_flags': [ 60 'link_flags': [
61 '-Wl,--start-group',
62 '-lbase_nacl_nonsfi', 61 '-lbase_nacl_nonsfi',
63 '-lcommand_buffer_client_nacl', 62 '-lcommand_buffer_client_nacl',
64 '-lcommand_buffer_common_nacl', 63 '-lcommand_buffer_common_nacl',
65 '-lcontent_common_nacl_nonsfi', 64 '-lcontent_common_nacl_nonsfi',
66 '-lelf_loader', 65 '-lelf_loader',
67 '-levent_nacl_nonsfi', 66 '-levent_nacl_nonsfi',
68 '-lgio', 67 '-lgio',
69 '-lgles2_cmd_helper_nacl', 68 '-lgles2_cmd_helper_nacl',
70 '-lgles2_implementation_nacl', 69 '-lgles2_implementation_nacl',
71 '-lgles2_utils_nacl', 70 '-lgles2_utils_nacl',
72 '-lgpu_ipc_nacl', 71 '-lgpu_ipc_nacl',
73 '-lipc_nacl_nonsfi', 72 '-lipc_nacl_nonsfi',
74 '-llatency_info_nacl', 73 '-llatency_info_nacl',
75 '-lplatform', 74 '-lplatform',
76 '-lppapi_ipc_nacl', 75 '-lppapi_ipc_nacl',
77 '-lppapi_proxy_nacl', 76 '-lppapi_proxy_nacl',
78 '-lppapi_shared_nacl', 77 '-lppapi_shared_nacl',
79 '-lshared_memory_support_nacl', 78 '-lshared_memory_support_nacl',
80 '-ltracing_nacl', 79 '-ltracing_nacl',
81 '-Wl,--end-group',
82 ], 80 ],
83 81
84 'conditions': [ 82 'conditions': [
85 ['target_arch=="ia32" or target_arch=="x64"', { 83 ['target_arch=="ia32" or target_arch=="x64"', {
86 'extra_deps_newlib32_nonsfi': [ 84 'extra_deps_newlib32_nonsfi': [
87 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', 85 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
88 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a ', 86 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a ',
89 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a ', 87 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a ',
90 '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a ', 88 '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a ',
91 '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a', 89 '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', 137 '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
140 '../native_client/tools.gyp:prep_toolchain', 138 '../native_client/tools.gyp:prep_toolchain',
141 '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', 139 '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
142 ], 140 ],
143 }, 141 },
144 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests. 142 # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.
145 ], 143 ],
146 }], 144 }],
147 ], 145 ],
148 } 146 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698