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

Side by Side Diff: remoting/remoting_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 | « remoting/remoting_key_tester.gypi ('k') | sandbox/sandbox_nacl_nonsfi.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 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 'includes': [ 6 'includes': [
7 '../build/common_untrusted.gypi', 7 '../build/common_untrusted.gypi',
8 'remoting_srcs.gypi', 8 'remoting_srcs.gypi',
9 ], 9 ],
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 '<(proto_out_dir)/mux.pb.cc', 67 '<(proto_out_dir)/mux.pb.cc',
68 '<(proto_out_dir)/video.pb.cc', 68 '<(proto_out_dir)/video.pb.cc',
69 ], 69 ],
70 'extra_deps': [ '<@(files_list)' ], 70 'extra_deps': [ '<@(files_list)' ],
71 'extra_args': [ '<@(files_list)' ], 71 'extra_args': [ '<@(files_list)' ],
72 }, 72 },
73 'defines': [ 73 'defines': [
74 'GOOGLE_PROTOBUF_HOST_ARCH_64_BIT=1' 74 'GOOGLE_PROTOBUF_HOST_ARCH_64_BIT=1'
75 ], 75 ],
76 'dependencies': [ 76 'dependencies': [
77 '../native_client/tools.gyp:prep_toolchain',
78 '../third_party/protobuf/protobuf_nacl.gyp:protobuf_lite_nacl', 77 '../third_party/protobuf/protobuf_nacl.gyp:protobuf_lite_nacl',
79 'proto/chromotocol.gyp:chromotocol_proto_lib', 78 'proto/chromotocol.gyp:chromotocol_proto_lib',
80 ], 79 ],
81 'export_dependent_settings': [ 80 'export_dependent_settings': [
82 '../third_party/protobuf/protobuf_nacl.gyp:protobuf_lite_nacl', 81 '../third_party/protobuf/protobuf_nacl.gyp:protobuf_lite_nacl',
83 ], 82 ],
84 'direct_dependent_settings': { 83 'direct_dependent_settings': {
85 'include_dirs': [ 84 'include_dirs': [
86 '<(proto_out_base)', 85 '<(proto_out_base)',
87 ], 86 ],
88 }, 87 },
89 }, # end of target 'remoting_proto_nacl' 88 }, # end of target 'remoting_proto_nacl'
90 89
91 { 90 {
92 'target_name': 'remoting_client_plugin_lib_nacl', 91 'target_name': 'remoting_client_plugin_lib_nacl',
93 'type': 'none', 92 'type': 'none',
94 'variables': { 93 'variables': {
95 'nacl_untrusted_build': 1, 94 'nacl_untrusted_build': 1,
96 'nlib_target': 'libremoting_client_plugin_lib_nacl.a', 95 'nlib_target': 'libremoting_client_plugin_lib_nacl.a',
97 'build_glibc': 0, 96 'build_glibc': 0,
98 'build_newlib': 0, 97 'build_newlib': 0,
99 'build_pnacl_newlib': 1, 98 'build_pnacl_newlib': 1,
100 }, 99 },
101 'dependencies': [ 100 'dependencies': [
102 '../base/base_nacl.gyp:base_nacl', 101 '../base/base_nacl.gyp:base_nacl',
103 '../jingle/jingle_nacl.gyp:jingle_glue_nacl', 102 '../jingle/jingle_nacl.gyp:jingle_glue_nacl',
104 '../native_client/tools.gyp:prep_toolchain',
105 '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted' , 103 '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted' ,
106 '../net/net_nacl.gyp:net_nacl', 104 '../net/net_nacl.gyp:net_nacl',
107 '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', 105 '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
108 '../third_party/expat/expat_nacl.gyp:expat_nacl', 106 '../third_party/expat/expat_nacl.gyp:expat_nacl',
109 '../third_party/khronos/khronos.gyp:khronos_headers', 107 '../third_party/khronos/khronos.gyp:khronos_headers',
110 '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl', 108 '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
111 '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl', 109 '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl',
112 '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', 110 '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
113 '../third_party/opus/opus_nacl.gyp:opus_nacl', 111 '../third_party/opus/opus_nacl.gyp:opus_nacl',
114 'remoting_proto_nacl', 112 'remoting_proto_nacl',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 '>(tc_lib_dir_pnacl_newlib)/libvpx_nacl.a', 172 '>(tc_lib_dir_pnacl_newlib)/libvpx_nacl.a',
175 '>(tc_lib_dir_pnacl_newlib)/libyuv_nacl.a', 173 '>(tc_lib_dir_pnacl_newlib)/libyuv_nacl.a',
176 ], 174 ],
177 }, 175 },
178 'dependencies': [ 176 'dependencies': [
179 '../base/base_nacl.gyp:base_i18n_nacl', 177 '../base/base_nacl.gyp:base_i18n_nacl',
180 '../base/base_nacl.gyp:base_nacl', 178 '../base/base_nacl.gyp:base_nacl',
181 '../crypto/crypto_nacl.gyp:crypto_nacl', 179 '../crypto/crypto_nacl.gyp:crypto_nacl',
182 '../jingle/jingle_nacl.gyp:jingle_glue_nacl', 180 '../jingle/jingle_nacl.gyp:jingle_glue_nacl',
183 '../media/media_nacl.gyp:media_yuv_nacl', 181 '../media/media_nacl.gyp:media_yuv_nacl',
184 '../native_client/tools.gyp:prep_toolchain',
185 '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted' , 182 '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted' ,
186 '../net/net_nacl.gyp:net_nacl', 183 '../net/net_nacl.gyp:net_nacl',
187 '../ppapi/native_client/native_client.gyp:ppapi_lib', 184 '../ppapi/native_client/native_client.gyp:ppapi_lib',
188 '../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 185 '../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
189 '../third_party/expat/expat_nacl.gyp:expat_nacl', 186 '../third_party/expat/expat_nacl.gyp:expat_nacl',
190 '../third_party/icu/icu_nacl.gyp:icudata_nacl', 187 '../third_party/icu/icu_nacl.gyp:icudata_nacl',
191 '../third_party/icu/icu_nacl.gyp:icui18n_nacl', 188 '../third_party/icu/icu_nacl.gyp:icui18n_nacl',
192 '../third_party/icu/icu_nacl.gyp:icuuc_nacl', 189 '../third_party/icu/icu_nacl.gyp:icuuc_nacl',
193 '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl', 190 '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
194 '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', 191 '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 '-lppapi_cpp', 231 '-lppapi_cpp',
235 '-lpthread', 232 '-lpthread',
236 '-lnacl_io', 233 '-lnacl_io',
237 ], 234 ],
238 'sources': [ 235 'sources': [
239 'client/plugin/pepper_module.cc', 236 'client/plugin/pepper_module.cc',
240 ], 237 ],
241 }, # end of target 'remoting_client_plugin_nacl' 238 }, # end of target 'remoting_client_plugin_nacl'
242 ] 239 ]
243 } 240 }
OLDNEW
« no previous file with comments | « remoting/remoting_key_tester.gypi ('k') | sandbox/sandbox_nacl_nonsfi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698