Reland of move all reference to carbon api

webrtc/base/base.gyp

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 211 matching lines @@
       'export_dependent_settings': [
         'rtc_base_approved',
       ],
       'defines': [
         'FEATURE_ENABLE_SSL',
         'SSL_USE_OPENSSL',
         'HAVE_OPENSSL_SSL_H',
         'LOGGING=1',
       ],
       'sources': [
+        'applefilesystem.mm',
         'arraysize.h',
         'asyncfile.cc',
         'asyncfile.h',
         'asyncinvoker.cc',
         'asyncinvoker.h',
         'asyncinvoker-inl.h',
         'asyncpacketsocket.cc',
         'asyncpacketsocket.h',
         'asyncresolverinterface.cc',
         'asyncresolverinterface.h',
@@ skipping 28 matching lines @@
         'helpers.h',
         'httpbase.cc',
         'httpbase.h',
         'httpclient.cc',
         'httpclient.h',
         'httpcommon-inl.h',
         'httpcommon.cc',
         'httpcommon.h',
         'httprequest.cc',
         'httprequest.h',
-        'iosfilesystem.mm',
         'ipaddress.cc',
         'ipaddress.h',
         'linked_ptr.h',
         'messagedigest.cc',
         'messagedigest.h',
         'messagehandler.cc',
         'messagehandler.h',
         'messagequeue.cc',
         'messagequeue.h',
         'nethelpers.cc',
@@ skipping 305 matching lines @@
                 'OTHER_LDFLAGS': [
                   '-framework Cocoa',
                   '-framework Foundation',
                   '-framework IOKit',
                   '-framework Security',
                   '-framework SystemConfiguration',
                 ],
               },
             },
           },
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'all_dependent_settings': {
-                'link_settings': {
-                  'xcode_settings': {
-                    'OTHER_LDFLAGS': [
-                      '-framework Carbon',
-                    ],
-                  },
-                },
-              },
-            }],
-          ],
         }],
         ['OS=="win" and nacl_untrusted_build==0', {
           'sources': [
             'win32.cc',
             'win32.h',
             'win32filesystem.cc',
             'win32filesystem.h',
             'win32securityerrors.cc',
             'win32window.cc',
             'win32window.h',
@@ skipping 28 matching lines @@
             'Debug_Base': {
               'defines': [
                 # Chromium's build/common.gypi defines this for all posix
                 # _except_ for ios & mac.  We want it there as well, e.g.
                 # because ASSERT and friends trigger off of it.
                 '_DEBUG',
               ],
             },
           }
         }],
-        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
-          'defines': [
-            'CARBON_DEPRECATED=YES',
-          ],
-        }],
         ['OS=="linux" or OS=="android"', {
           'sources': [
             'linux.cc',
             'linux.h',
           ],
         }],
         ['build_ssl==1', {
           'dependencies': [
             '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
           ],
         }, {
           'include_dirs': [
             '<(ssl_root)',
           ],
         }],
       ],
     },
     {
      'target_name': 'gtest_prod',
       'type': 'static_library',
       'sources': [
         'gtest_prod_util.h',
       ],
     },
   ],
 }