admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base.gyp: Add conditions for NaCl builds.

Browse Source 
These are needed to be able to cleanup the NaCl
GYP code in src/third_party/libjingle before switching
over to WebRTC's own targets.
See https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjingle/libjingle_nacl.gyp&l=260 for details.

BUG=webrtc:4256
R=perkj@webrtc.org

Review URL: https://codereview.webrtc.org/1984613002 .

Cr-Commit-Position: refs/heads/master@{#12819}
This commit is contained in:
kjellander@webrtc.org 2016-05-20 09:52:43 +02:00
parent 6c47031ff9
commit 03d45b016a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/base/base.gyp
View File

@ -475,7 +475,7 @@
],
},
}],
['OS=="mac" or OS=="ios"', {
['(OS=="mac" or OS=="ios") and nacl_untrusted_build==0', {
'sources': [
'maccocoathreadhelper.h',
'maccocoathreadhelper.mm',
@ -555,7 +555,7 @@
}],
],
}],
['OS=="win"', {
['OS=="win" and nacl_untrusted_build==0', {
'sources': [
'win32.cc',
'win32.h',

4
webrtc/build/common.gypi
View File

@ -95,6 +95,10 @@
# third party code will still have the reduced warning settings.
'chromium_code': 1,
# Targets are by default not NaCl untrusted code. Use this variable exclude
# code that uses libraries that aren't available in the NaCl sandbox.
'nacl_untrusted_build%': 0,
# Set to 1 to enable code coverage on Linux using the gcov library.
'coverage%': 0,