Revert "libjingle_unittest now compiles and passes on iOS!"

This reverts commit r5986 as it fails compilation on Mac
(non-iOS). The failure was not discovered on the commitbots
since they don't clobber their builds.

BUG=3241
TBR=fischman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5997 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 33 insertions, 10 deletions

diff --git a/libjingle_tests.gyp b/libjingle_tests.gyp
index 013c228..7816137 100755
--- a/libjingle_tests.gyp
+++ b/libjingle_tests.gyp
@@ -104,7 +104,6 @@
     {
       'target_name': 'libjingle_unittest',
       'type': 'executable',
-      'includes': [ 'build/ios_tests.gypi', ],
       'dependencies': [
         'gunit',
         'libjingle.gyp:libjingle',
@@ -493,27 +492,51 @@
       # does just fine on 10.6 too).
       'targets': [
         {
-          'target_name': 'libjingle_peerconnection_objc_test',
+        'target_name': 'libjingle_peerconnection_objc_test',
+          'variables': {
+            'infoplist_file': './app/webrtc/objctests/Info.plist',
+          },
           'type': 'executable',
-          'includes': [ 'build/ios_tests.gypi', ],
+          'mac_bundle': 1,
+          'mac_bundle_resources': [
+            '<(infoplist_file)',
+          ],
+          # The plist is listed above so that it appears in XCode's file list,
+          # but we don't actually want to bundle it.
+          'mac_bundle_resources!': [
+            '<(infoplist_file)',
+          ],
+          'xcode_settings': {
+            'CLANG_ENABLE_OBJC_ARC': 'YES',
+            # common.gypi enables this for mac but we want this to be disabled
+            # like it is for ios.
+            'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
+            'INFOPLIST_FILE': '<(infoplist_file)',
+          },
           'dependencies': [
             'gunit',
             'libjingle.gyp:libjingle_peerconnection_objc',
           ],
+          'FRAMEWORK_SEARCH_PATHS': [
+            '$(inherited)',
+            '$(SDKROOT)/Developer/Library/Frameworks',
+            '$(DEVELOPER_LIBRARY_DIR)/Frameworks',
+          ],
           'sources': [
             'app/webrtc/objctests/RTCPeerConnectionSyncObserver.h',
             'app/webrtc/objctests/RTCPeerConnectionSyncObserver.m',
             'app/webrtc/objctests/RTCPeerConnectionTest.mm',
             'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.h',
             'app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m',
-            # TODO(fischman): figure out if this works for ios or if it
-            # needs a GUI driver.
-            'app/webrtc/objctests/mac/main.mm',
           ],
-          'FRAMEWORK_SEARCH_PATHS': [
-            '$(inherited)',
-            '$(SDKROOT)/Developer/Library/Frameworks',
-            '$(DEVELOPER_LIBRARY_DIR)/Frameworks',
+          'conditions': [
+            ['OS=="mac" or OS=="ios"', {
+              'sources': [
+                # TODO(fischman): figure out if this works for ios or if it
+                # needs a GUI driver.
+                'app/webrtc/objctests/mac/main.mm',
+              ],
+            }],
           ],
         },  # target libjingle_peerconnection_objc_test
       ],