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

Side by Side Diff: third_party/libjingle/libjingle_nacl.gyp

Issue 1332163005: nacl: Be more consistent about setting nacl_untrusted_build on targets that use untrusted.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 'libjingle_source': "source", 7 'libjingle_source': "source",
8 'webrtc_base': "../webrtc/base", 8 'webrtc_base': "../webrtc/base",
9 'webrtc_xmllite': "../webrtc/libjingle/xmllite", 9 'webrtc_xmllite': "../webrtc/libjingle/xmllite",
10 'webrtc_p2p': "../webrtc/p2p", 10 'webrtc_p2p': "../webrtc/p2p",
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 'export_dependent_settings': [ 294 'export_dependent_settings': [
295 '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untr usted', 295 '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untr usted',
296 ], 296 ],
297 }, # end of target 'libjingle_nacl' 297 }, # end of target 'libjingle_nacl'
298 298
299 { 299 {
300 'target_name': 'libjingle_p2p_constants_nacl', 300 'target_name': 'libjingle_p2p_constants_nacl',
301 'type': 'none', 301 'type': 'none',
302 'variables': { 302 'variables': {
303 'nlib_target': 'libjingle_p2p_constants_nacl.a', 303 'nlib_target': 'libjingle_p2p_constants_nacl.a',
304 'nacl_untrusted_build': 1,
304 'build_glibc': 0, 305 'build_glibc': 0,
305 'build_newlib': 1, 306 'build_newlib': 1,
306 'build_pnacl_newlib': 1, 307 'build_pnacl_newlib': 1,
307 }, 308 },
308 'configurations': { 309 'configurations': {
309 'Debug': { 310 'Debug': {
310 'defines': [ 311 'defines': [
311 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 312 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
312 # _DEBUG and remove this define. See below as well. 313 # _DEBUG and remove this define. See below as well.
313 '_DEBUG', 314 '_DEBUG',
314 ], 315 ],
315 } 316 }
316 }, 317 },
317 'include_dirs': [ 318 'include_dirs': [
318 './<(libjingle_source)', 319 './<(libjingle_source)',
319 '../' 320 '../'
320 ], 321 ],
321 'sources': [ 322 'sources': [
322 '<(webrtc_p2p)/base/constants.cc', 323 '<(webrtc_p2p)/base/constants.cc',
323 '<(webrtc_p2p)/base/constants.h', 324 '<(webrtc_p2p)/base/constants.h',
324 ], 325 ],
325 }, # end of target 'libjingle_p2p_constants_nacl' 326 }, # end of target 'libjingle_p2p_constants_nacl'
326 ], 327 ],
327 } 328 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698