Fix iOS GN build and cleanup system_wrappers

webrtc/system_wrappers/system_wrappers.gyp

 # Copyright (c) 2012 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', ],
   'targets': [
     {
       'target_name': 'system_wrappers',
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
         '../base/base.gyp:rtc_base_approved',
       ],
       'sources': [
         'include/aligned_array.h',
         'include/aligned_malloc.h',
         'include/atomic32.h',
         'include/clock.h',
+        'include/cpu_features_wrapper.h',
         'include/cpu_info.h',
-        'include/cpu_features_wrapper.h',
         'include/critical_section_wrapper.h',
         'include/data_log.h',
         'include/data_log_c.h',
         'include/data_log_impl.h',
         'include/event_wrapper.h',
         'include/field_trial.h',
         'include/file_wrapper.h',
         'include/fix_interlocked_exchange_pointer_win.h',
-        'include/logcat_trace_context.h',
         'include/logging.h',
         'include/metrics.h',
         'include/ntp_time.h',
         'include/rtp_to_ntp.h',
         'include/rw_lock_wrapper.h',
         'include/sleep.h',
         'include/sort.h',
         'include/static_instance.h',
         'include/stl_util.h',
         'include/stringize_macros.h',
         'include/timestamp_extrapolator.h',
         'include/trace.h',
         'include/utf_util_win.h',
         'source/aligned_malloc.cc',
-        'source/atomic32_mac.cc',
-        'source/atomic32_posix.cc',
         'source/atomic32_win.cc',
         'source/clock.cc',
         'source/condition_variable_event_win.cc',
         'source/condition_variable_event_win.h',
+        'source/cpu_features.cc',
         'source/cpu_info.cc',
-        'source/cpu_features.cc',
-        'source/data_log.cc',
         'source/data_log_c.cc',
-        'source/data_log_no_op.cc',
         'source/event.cc',
         'source/event_timer_posix.cc',
         'source/event_timer_posix.h',
         'source/event_timer_win.cc',
         'source/event_timer_win.h',
         'source/file_impl.cc',
         'source/file_impl.h',
-        'source/logcat_trace_context.cc',
         'source/logging.cc',
         'source/rtp_to_ntp.cc',
         'source/rw_lock.cc',
         'source/rw_lock_posix.cc',
         'source/rw_lock_posix.h',
         'source/rw_lock_win.cc',
         'source/rw_lock_win.h',
         'source/rw_lock_winxp_win.cc',
         'source/rw_lock_winxp_win.h',
         'source/sleep.cc',
         'source/sort.cc',
         'source/timestamp_extrapolator.cc',
         'source/trace_impl.cc',
         'source/trace_impl.h',
         'source/trace_posix.cc',
         'source/trace_posix.h',
         'source/trace_win.cc',
         'source/trace_win.h',
       ],
       'conditions': [
         ['enable_data_logging==1', {
-          'sources!': [ 'source/data_log_no_op.cc', ],
+          'sources': [ 'source/data_log.cc', ],
         }, {
-          'sources!': [ 'source/data_log.cc', ],
+          'sources': [ 'source/data_log_no_op.cc', ],
         },],
         ['OS=="android"', {
           'defines': [
             'WEBRTC_THREAD_RR',
            ],
           'conditions': [
             ['build_with_chromium==1', {
               'dependencies': [
                 'cpu_features_chromium.gyp:cpu_features_android',
               ],
             }, {
               'dependencies': [
                 'cpu_features_webrtc.gyp:cpu_features_android',
               ],
             }],
           ],
           'link_settings': {
             'libraries': [
               '-llog',
             ],
           },
-        }, {  # OS!="android"
-          'sources!': [
+          'sources': [
             'include/logcat_trace_context.h',
             'source/logcat_trace_context.cc',
           ],
         }],
         ['OS=="linux"', {
           'defines': [
             'WEBRTC_THREAD_RR',
           ],
           'conditions': [
             ['build_with_chromium==0', {
               'dependencies': [
                 'cpu_features_webrtc.gyp:cpu_features_linux',
               ],
             }],
           ],
           'link_settings': {
             'libraries': [ '-lrt', ],
           },
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ],
           },
-          'sources!': [
-            'source/atomic32_posix.cc',
+        }],
+        ['OS=="linux" or OS=="android"', {
+          'sources': [
+            'source/atomic32_non_darwin_unix.cc',
           ],
         }],
         ['OS=="ios" or OS=="mac"', {
           'defines': [
             'WEBRTC_THREAD_RR',
           ],
+          'sources': [
+            'source/atomic32_darwin.cc',
+          ],
         }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lwinmm.lib', ],
           },
         }],
       ], # conditions
-      'target_conditions': [
-        # We need to do this in a target_conditions block to override the
-        # filename_rules filters.
-        ['OS=="ios"', {
-          # Pull in specific Mac files for iOS (which have been filtered out
-          # by file name rules).
-          'sources/': [
-            ['include', '^source/atomic32_mac\\.'],
-          ],
-          'sources!': [
-            'source/atomic32_posix.cc',
-          ],
-        }],
-      ],
       # Disable warnings to enable Win64 build, issue 1323.
       'msvs_disabled_warnings': [
         4267,  # size_t to int truncation.
         4334,  # Ignore warning on shift operator promotion.
       ],
     }, {
       'target_name': 'field_trial_default',
       'type': 'static_library',
       'sources': [
         'include/field_trial_default.h',
@@ skipping 11 matching lines @@
       'type': 'static_library',
       'dependencies': [
         'system_wrappers',
         'field_trial_default',
         'metrics_default',
       ]
     },
   ], # targets
 }