Build Mac Chromoting pref-pane as universal binary

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index e1258ef2e5a60808c206f2324dfea0cdd32000a7..0b9613ea41c4d026c0fdea89781638a681a6c75f 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -381,20 +381,75 @@
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'prefPane',
-          'dependencies': [
-            'remoting_base',
-            'remoting_host',
-          ],
           'sources': [

[Sergey Ulanov, 2012/05/11 22:12:39]

Please add a comment here to explain why we need to rebuild all these files here
and can't depend on base.

-            'host/me2me_preference_pane.h',
+            '../base/at_exit.cc',
+            '../base/base64.cc',
+            '../base/callback_internal.cc',
+            '../base/debug/alias.cc',
+            '../base/debug/debugger_posix.cc',
+            '../base/debug/stack_trace.cc',
+            '../base/debug/stack_trace_posix.cc',
+            '../base/file_path.cc',
+            '../base/file_util.cc',
+            '../base/file_util_mac.mm',
+            '../base/file_util_posix.cc',
+            '../base/json/json_reader.cc',
+            '../base/json/json_writer.cc',
+            '../base/json/string_escape.cc',
+            '../base/lazy_instance.cc',
+            '../base/logging.cc',
+            '../base/mac/authorization_util.mm',
+            '../base/mac/foundation_util.mm',
+            '../base/mac/launchd.cc',
+            '../base/mac/mac_logging.cc',
+            '../base/memory/ref_counted.cc',
+            '../base/message_loop.cc',
+            '../base/safe_strerror_posix.cc',
+            '../base/string16.cc',
+            '../base/string_number_conversions.cc',
+            '../base/string_piece.cc',
+            '../base/string_util.cc',
+            '../base/stringprintf.cc',
+            '../base/synchronization/lock.cc',
+            '../base/synchronization/lock_impl_posix.cc',
+            '../base/sys_string_conversions_mac.mm',
+            '../base/third_party/dmg_fp/dtoa_wrapper.cc',
+            '../base/third_party/dmg_fp/g_fmt.cc',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.c',
+            '../base/third_party/icu/icu_utf.cc',
+            '../base/threading/non_thread_safe_impl.cc',
+            '../base/threading/platform_thread_posix.cc',
+            '../base/threading/thread_checker_impl.cc',
+            '../base/threading/thread_local_posix.cc',
+            '../base/threading/thread_restrictions.cc',
+            '../base/utf_string_conversion_utils.cc',
+            '../base/utf_string_conversions.cc',
+            '../base/values.cc',
+            '../crypto/hmac_mac.cc',
+            '../third_party/modp_b64/modp_b64.cc',
+            'host/host_config.cc',
+	    'host/host_config.h',
+            'host/in_memory_host_config.cc',
+            'host/in_memory_host_config.h',
+            'host/json_host_config.cc',
+            'host/json_host_config.h',
             'host/me2me_preference_pane.mm',
+            'host/me2me_preference_pane.h',
+            'protocol/authentication_method.cc',
+            'protocol/authentication_method.h',
           ],
           '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'],
+	    'DEAD_CODE_STRIPPING': 'YES',
+	    '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)"',