diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:12:08 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-16 13:12:08 +0100 |
| commit | 4eff397521c1d60004c1862e807d8085c9620bf1 (patch) | |
| tree | 5d1ad8e0ddb34e37e18e0fbdde057c2fe527f709 /system_wrappers/source/system_wrappers.gyp | |
| parent | d658c1128db26424e73674abd5a5051cc8ef15ab (diff) | |
| parent | da7c539c377367da25fc913d4399c5f0f69764ad (diff) | |
| download | webrtc-4eff397521c1d60004c1862e807d8085c9620bf1.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at da7c539c377367da25fc913d4399c5f0f69764ad
This commit was generated by merge_from_chromium.py.
Change-Id: Ieab52294a0a33f311c9f61dad4f7ab932a7280d5
Diffstat (limited to 'system_wrappers/source/system_wrappers.gyp')
| -rw-r--r-- | system_wrappers/source/system_wrappers.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/system_wrappers/source/system_wrappers.gyp b/system_wrappers/source/system_wrappers.gyp index 36d4d9cd..66b34356 100644 --- a/system_wrappers/source/system_wrappers.gyp +++ b/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,6 +38,7 @@ '../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/logcat_trace_context.h', @@ -191,6 +195,15 @@ 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': [ |