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

Side by Side Diff: components/nacl_nonsfi.gyp

Issue 2129803002: Revert of pepper: parse context creation attrib list on the plugin side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gpu_pref_size_in_attrs
Patch Set: Created 4 years, 5 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 | « no previous file | content/renderer/pepper/ppb_graphics_3d_impl.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 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'nacl/loader/nonsfi/nonsfi_main.cc', 58 'nacl/loader/nonsfi/nonsfi_main.cc',
59 ], 59 ],
60 60
61 'link_flags': [ 61 'link_flags': [
62 '-lbase_nacl_nonsfi', 62 '-lbase_nacl_nonsfi',
63 '-lcommand_buffer_client_nacl', 63 '-lcommand_buffer_client_nacl',
64 '-lcommand_buffer_common_nacl', 64 '-lcommand_buffer_common_nacl',
65 '-lcontent_common_nacl_nonsfi', 65 '-lcontent_common_nacl_nonsfi',
66 '-lelf_loader', 66 '-lelf_loader',
67 '-levent_nacl_nonsfi', 67 '-levent_nacl_nonsfi',
68 '-lgfx_geometry_nacl',
69 '-lgfx_ipc_geometry_nacl',
70 '-lgio', 68 '-lgio',
71 '-lgles2_cmd_helper_nacl', 69 '-lgles2_cmd_helper_nacl',
72 '-lgles2_implementation_nacl', 70 '-lgles2_implementation_nacl',
73 '-lgles2_utils_nacl', 71 '-lgles2_utils_nacl',
74 '-lgpu_ipc_nacl', 72 '-lgpu_ipc_nacl',
75 '-lipc_nacl_nonsfi', 73 '-lipc_nacl_nonsfi',
76 '-lmojo_cpp_bindings_nacl', 74 '-lmojo_cpp_bindings_nacl',
77 '-lmojo_cpp_system_nacl', 75 '-lmojo_cpp_system_nacl',
78 '-lmojo_public_system_nacl', 76 '-lmojo_public_system_nacl',
79 '-lmojo_system_impl_nacl_nonsfi', 77 '-lmojo_system_impl_nacl_nonsfi',
80 '-lnacl_helper_nonsfi_sandbox', 78 '-lnacl_helper_nonsfi_sandbox',
81 '-lplatform', 79 '-lplatform',
82 '-lppapi_ipc_nacl', 80 '-lppapi_ipc_nacl',
83 '-lppapi_proxy_nacl', 81 '-lppapi_proxy_nacl',
84 '-lppapi_shared_nacl', 82 '-lppapi_shared_nacl',
85 '-lsandbox_linux_nacl_nonsfi', 83 '-lsandbox_linux_nacl_nonsfi',
86 '-lshared_memory_support_nacl', 84 '-lshared_memory_support_nacl',
87 '-ltracing_nacl', 85 '-ltracing_nacl',
88 ], 86 ],
89 87
90 'conditions': [ 88 'conditions': [
91 ['target_arch=="ia32" or target_arch=="x64"', { 89 ['target_arch=="ia32" or target_arch=="x64"', {
92 'extra_deps_newlib32_nonsfi': [ 90 'extra_deps_newlib32_nonsfi': [
93 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', 91 '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
94 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a ', 92 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a ',
95 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a ', 93 '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a ',
96 '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a ', 94 '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a ',
97 '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a', 95 '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a',
98 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a', 96 '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
99 '>(tc_lib_dir_nonsfi_helper32)/libgfx_geometry_nacl.a',
100 '>(tc_lib_dir_nonsfi_helper32)/libgfx_ipc_geometry_nacl.a',
101 '>(tc_lib_dir_nonsfi_helper32)/libgio.a', 97 '>(tc_lib_dir_nonsfi_helper32)/libgio.a',
102 '>(tc_lib_dir_nonsfi_helper32)/libgles2_cmd_helper_nacl.a', 98 '>(tc_lib_dir_nonsfi_helper32)/libgles2_cmd_helper_nacl.a',
103 '>(tc_lib_dir_nonsfi_helper32)/libgles2_implementation_nacl.a' , 99 '>(tc_lib_dir_nonsfi_helper32)/libgles2_implementation_nacl.a' ,
104 '>(tc_lib_dir_nonsfi_helper32)/libgles2_utils_nacl.a', 100 '>(tc_lib_dir_nonsfi_helper32)/libgles2_utils_nacl.a',
105 '>(tc_lib_dir_nonsfi_helper32)/libgpu_ipc_nacl.a', 101 '>(tc_lib_dir_nonsfi_helper32)/libgpu_ipc_nacl.a',
106 '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a', 102 '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a',
107 '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_bindings_nacl.a', 103 '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_bindings_nacl.a',
108 '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_system_nacl.a', 104 '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_system_nacl.a',
109 '>(tc_lib_dir_nonsfi_helper32)/libmojo_public_system_nacl.a', 105 '>(tc_lib_dir_nonsfi_helper32)/libmojo_public_system_nacl.a',
110 '>(tc_lib_dir_nonsfi_helper32)/libmojo_system_impl_nacl_nonsfi .a', 106 '>(tc_lib_dir_nonsfi_helper32)/libmojo_system_impl_nacl_nonsfi .a',
111 '>(tc_lib_dir_nonsfi_helper32)/libnacl_helper_nonsfi_sandbox.a ', 107 '>(tc_lib_dir_nonsfi_helper32)/libnacl_helper_nonsfi_sandbox.a ',
112 '>(tc_lib_dir_nonsfi_helper32)/libplatform.a', 108 '>(tc_lib_dir_nonsfi_helper32)/libplatform.a',
113 '>(tc_lib_dir_nonsfi_helper32)/libppapi_ipc_nacl.a', 109 '>(tc_lib_dir_nonsfi_helper32)/libppapi_ipc_nacl.a',
114 '>(tc_lib_dir_nonsfi_helper32)/libppapi_proxy_nacl.a', 110 '>(tc_lib_dir_nonsfi_helper32)/libppapi_proxy_nacl.a',
115 '>(tc_lib_dir_nonsfi_helper32)/libppapi_shared_nacl.a', 111 '>(tc_lib_dir_nonsfi_helper32)/libppapi_shared_nacl.a',
116 '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_nacl_nonsfi.a' , 112 '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_nacl_nonsfi.a' ,
117 '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a ', 113 '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a ',
118 '>(tc_lib_dir_nonsfi_helper32)/libtracing_nacl.a', 114 '>(tc_lib_dir_nonsfi_helper32)/libtracing_nacl.a',
119 ], 115 ],
120 }], 116 }],
121 ['target_arch=="arm"', { 117 ['target_arch=="arm"', {
122 'extra_deps_newlib_arm_nonsfi': [ 118 'extra_deps_newlib_arm_nonsfi': [
123 '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a', 119 '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a',
124 '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_client_nacl .a', 120 '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_client_nacl .a',
125 '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_common_nacl .a', 121 '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_common_nacl .a',
126 '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi .a', 122 '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi .a',
127 '>(tc_lib_dir_nonsfi_helper_arm)/libelf_loader.a', 123 '>(tc_lib_dir_nonsfi_helper_arm)/libelf_loader.a',
128 '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a', 124 '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a',
129 '>(tc_lib_dir_nonsfi_helper_arm)/libgfx_geometry_nacl.a',
130 '>(tc_lib_dir_nonsfi_helper_arm)/libgfx_ipc_geometry_nacl.a',
131 '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a', 125 '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a',
132 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_cmd_helper_nacl.a', 126 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_cmd_helper_nacl.a',
133 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_implementation_nacl. a', 127 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_implementation_nacl. a',
134 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_utils_nacl.a', 128 '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_utils_nacl.a',
135 '>(tc_lib_dir_nonsfi_helper_arm)/libgpu_ipc_nacl.a', 129 '>(tc_lib_dir_nonsfi_helper_arm)/libgpu_ipc_nacl.a',
136 '>(tc_lib_dir_nonsfi_helper_arm)/libipc_nacl_nonsfi.a', 130 '>(tc_lib_dir_nonsfi_helper_arm)/libipc_nacl_nonsfi.a',
137 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_bindings_nacl.a', 131 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_bindings_nacl.a',
138 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_system_nacl.a', 132 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_system_nacl.a',
139 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_public_system_nacl.a' , 133 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_public_system_nacl.a' ,
140 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_system_impl_nacl_nons fi.a', 134 '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_system_impl_nacl_nons fi.a',
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 '../build/isolate.gypi', 288 '../build/isolate.gypi',
295 ], 289 ],
296 'sources': [ 290 'sources': [
297 'nacl_helper_nonsfi_unittests.isolate', 291 'nacl_helper_nonsfi_unittests.isolate',
298 ], 292 ],
299 }, 293 },
300 ], 294 ],
301 }], 295 }],
302 ], 296 ],
303 } 297 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/ppb_graphics_3d_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698