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 /all.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 'all.gyp')
| -rw-r--r-- | all.gyp | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -14,17 +14,9 @@ 'type': 'none', 'dependencies': [ 'webrtc/webrtc.gyp:*', - ], - # TODO(henrike): fix build errors on 64 bit Mac for libjingle. See issue - # 2124. Once done the entire conditional below can be removed. - 'conditions': [ - ['OS!="mac" or target_arch!="x64" or libjingle_objc==1', { - 'dependencies': [ - 'talk/libjingle.gyp:*', - 'talk/libjingle_examples.gyp:*', - 'talk/libjingle_tests.gyp:*', - ], - }], + 'talk/libjingle.gyp:*', + 'talk/libjingle_examples.gyp:*', + 'talk/libjingle_tests.gyp:*', ], }, ], |