1 files changed, 26 insertions, 22 deletions
diff --git a/chromium/third_party/webrtc/system_wrappers/source/system_wrappers.gyp b/chromium/third_party/webrtc/system_wrappers/source/system_wrappers.gyp
index 41a736e14b4..66b34356c22 100644
--- a/chromium/third_party/webrtc/system_wrappers/source/system_wrappers.gyp
+++ b/chromium/third_party/webrtc/system_wrappers/source/system_wrappers.gyp
@@ -16,6 +16,9 @@
         'spreadsortlib',
         '../interface',
       ],
+      'dependencies': [
+        '../../base/base.gyp:webrtc_base',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
@@ -35,23 +38,29 @@
         '../interface/data_log_impl.h',
         '../interface/event_tracer.h',
         '../interface/event_wrapper.h',
+        '../interface/field_trial.h',
         '../interface/file_wrapper.h',
         '../interface/fix_interlocked_exchange_pointer_win.h',
-        '../interface/list_wrapper.h',
         '../interface/logcat_trace_context.h',
         '../interface/logging.h',
         '../interface/ref_count.h',
+        '../interface/rtp_to_ntp.h',
         '../interface/rw_lock_wrapper.h',
         '../interface/scoped_ptr.h',
         '../interface/scoped_refptr.h',
+        '../interface/scoped_vector.h',
         '../interface/sleep.h',
         '../interface/sort.h',
         '../interface/static_instance.h',
+        '../interface/stl_util.h',
         '../interface/stringize_macros.h',
+        '../interface/thread_annotations.h',
         '../interface/thread_wrapper.h',
         '../interface/tick_util.h',
+        '../interface/timestamp_extrapolator.h',
         '../interface/trace.h',
         '../interface/trace_event.h',
+        '../interface/utf_util_win.h',
         'aligned_malloc.cc',
         'atomic32_mac.cc',
         'atomic32_posix.cc',
@@ -82,9 +91,9 @@
         'event_win.h',
         'file_impl.cc',
         'file_impl.h',
-        'list_no_stl.cc',
         'logcat_trace_context.cc',
         'logging.cc',
+        'rtp_to_ntp.cc',
         'rw_lock.cc',
         'rw_lock_generic.cc',
         'rw_lock_generic.h',
@@ -101,6 +110,7 @@
         'thread_posix.h',
         'thread_win.cc',
         'thread_win.h',
+        'timestamp_extrapolator.cc',
         'trace_impl.cc',
         'trace_impl.h',
         'trace_posix.cc',
@@ -185,40 +195,34 @@
         4267,  # size_t to int truncation.
         4334,  # Ignore warning on shift operator promotion.
       ],
+    }, {
+      'target_name': 'field_trial_default',
+      'type': 'static_library',
+      'sources': [
+        'field_trial_default.cc',
+      ],
+      'dependencies': [
+        'system_wrappers',
+      ]
     },
   ], # targets
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
-          'variables': {
-            # Treat this as third-party code.
-            'chromium_code': 0,
-          },
           'target_name': 'cpu_features_android',
           'type': 'static_library',
           'sources': [
-            # TODO(leozwang): Ideally we want to audomatically exclude .c files
-            # as with .cc files, gyp currently only excludes .cc files.
             'cpu_features_android.c',
           ],
           'conditions': [
-            ['include_ndk_cpu_features==1', {
-              'conditions': [
-                ['android_webview_build == 1', {
-                  'libraries': [
-                    'cpufeatures.a'
-                  ],
-                }, {
-                  'dependencies': [
-                    '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features',
-                  ],
-                }],
+            ['android_webview_build == 1', {
+              'libraries': [
+                'cpufeatures.a'
               ],
             }, {
-              'sources': [
-                'android/cpu-features.c',
-                'android/cpu-features.h',
+              'dependencies': [
+                '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features',
               ],
             }],
           ],