Build pref-pane as universal binary on Mac OS X

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 681cad6734e49f6bfbb9abbad01e1722ce5971a7..c6b49141204b523f138bd473e960c7ac966ddb3c 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -379,10 +379,6 @@
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'prefPane',
-          'dependencies': [
-            'remoting_base',
-            'remoting_host',
-          ],
           'defines': [
             'JSON_USE_EXCEPTION=0',
           ],
@@ -391,20 +387,33 @@
             '../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/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',
           ],
           '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'],

[Nico, 2012/05/16 20:22:43]

This isn't supported in ninja yet, so it won't pass the trybots (and will break
them if you land manually)

[Lambros, 2012/05/17 18:03:29]

OK, I'll hold off on landing the "ARCHS" change.

+            'GCC_ENABLE_OBJC_GC': 'supported',

[Nico, 2012/05/16 20:22:43]

ninja ignores this setting at the moment. i guess this needs to be set for
prefpanes? (i can add support for it)

[Lambros, 2012/05/17 18:03:29]

The 64-bit prefpane needs to support GC, otherwise it triggers a "GC mismatch"
error and the System Preferences applet restarts in 32-bit mode.

             '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)"',