Build pref-pane as universal binary on Mac OS X

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     # Use consistent strings across all platforms. Note that the plugin name
@@ skipping 368 matching lines @@
               ],
             },
           ],  # actions
         }, # end of target 'remoting_me2me_host_archive'
 
         {
           'target_name': 'remoting_host_prefpane',
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'prefPane',
-          'dependencies': [
-            'remoting_base',
-            'remoting_host',
-          ],
           'defines': [
             'JSON_USE_EXCEPTION=0',
           ],
           'include_dirs': [
             '../third_party/jsoncpp/overrides/include/',
             '../third_party/jsoncpp/source/include/',
             '../third_party/jsoncpp/source/src/lib_json/',
-          ],
+          ],
+
+          # These source files are included directly, instead of adding target
+          # dependencies, because the targets are not yet built for 64-bit on
+          # Mac OS X - http://crbug.com/125116.
+          #
+          # TODO(lambroslambrou): Fix this when Chrome supports building for
+          # Mac OS X 64-bit - http://crbug.com/128122.
           'sources': [
-            # The jsoncpp target is not yet built for Mac OS X 64-bit, so
-            # include the files directly, instead of depending on the target.
-            '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
-            '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
-            '../third_party/modp_b64/modp_b64.cc',
+            '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
+            '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
+            '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
+            '../third_party/modp_b64/modp_b64.cc',
+            'host/host_config.cc',
             'host/me2me_preference_pane.h',
             'host/me2me_preference_pane.mm',
             'host/me2me_preference_pane_confirm_pin.h',
             'host/me2me_preference_pane_confirm_pin.mm',
             'host/me2me_preference_pane_disable.h',
             'host/me2me_preference_pane_disable.mm',
           ],
           'link_settings': {
             'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
+              '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
           'xcode_settings': {
+            'ARCHS': ['i386', 'x86_64'],
+            'GCC_ENABLE_OBJC_GC': 'supported',
             'INFOPLIST_FILE': 'host/me2me_preference_pane-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
             'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_BY="<(copyright_by)" PREF_PANE_ICON_LABEL="<(pref_pane_icon_label)"',
           },
           'mac_bundle_resources': [
             'host/me2me_preference_pane.xib',
             'host/me2me_preference_pane_confirm_pin.xib',
             'host/me2me_preference_pane_disable.xib',
             'host/me2me_preference_pane-Info.plist',
             'resources/chromoting128.png',
@@ skipping 1322 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }