zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable ObjC build by default and reenable 64-bit mac libjingle build

Browse Source 
BUG=2124
TESTED=trybots & building for mac, mac64, ios-sim, and ios-device on my MBP all build everything in out/Debug.
R=niklas.enbom@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2080004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4620 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org
2013-08-26 19:31:21 +00:00
parent 4498d013f6
commit e3de6b1e90
7 changed files with 87 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
talk/libjingle_examples.gyp
View File

@ -218,7 +218,7 @@
], # targets
}], # OS=="linux" or OS=="win"
['libjingle_objc==1 and OS=="ios"', {
['OS=="ios"', {
'targets': [
{
'target_name': 'AppRTCDemo',
@ -276,17 +276,23 @@
# we could pick more intelligently among the keys, but as a
# first cut just tell the developer to specify a key identity
# explicitly.
'ensure_single_key': '<!(python -c "assert len(\'\'\'<(key_id)\'\'\') > 0 and \'\\n\' not in \'\'\'<(key_id)\'\'\', \'key_id gyp variable needs to be set explicitly because there are multiple codesigning keys, or none!\'")',
'ensure_single_key': '<!(python -c "assert \'\\n\' not in \'\'\'<(key_id)\'\'\', \'key_id gyp variable needs to be set explicitly because there are multiple codesigning keys!\'")',
},
'action': [
'/usr/bin/codesign', '-v', '--force', '--sign', '<(key_id)',
'${BUILT_PRODUCTS_DIR}/AppRTCDemo.app',
'conditions': [
['key_id==""', {
'action': [ 'echo', 'Skipping signing' ],
}, {
'action': [
'/usr/bin/codesign', '-v', '--force', '--sign', '<(key_id)',
'${BUILT_PRODUCTS_DIR}/AppRTCDemo.app',
],
}],
],
},
],
}, # target AppRTCDemo
], # targets
}], # libjingle_objc==1
}], # OS=="ios"
['OS=="android"', {
'targets': [