diff options
| author | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-26 19:31:21 +0000 |
|---|---|---|
| committer | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-26 19:31:21 +0000 |
| commit | e3de6b1e9070806667ce9179c9607b274bf853f5 (patch) | |
| tree | e40cafb021c8e3e605fd0aa89a8917003b675ab2 /talk/libjingle_examples.gyp | |
| parent | 4498d013f677889c85921dc52cc82b5b8741022c (diff) | |
| download | webrtc-e3de6b1e9070806667ce9179c9607b274bf853f5.tar.gz | |
Enable ObjC build by default and reenable 64-bit mac libjingle build
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
Diffstat (limited to 'talk/libjingle_examples.gyp')
| -rwxr-xr-x | talk/libjingle_examples.gyp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp index 78bfe654f1..d4aa4a4271 100755 --- a/talk/libjingle_examples.gyp +++ b/talk/libjingle_examples.gyp @@ -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': [ |