diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
| commit | 58e6fbe4ee35d65e14b626c557d37565bf8ad179 (patch) | |
| tree | 8cf095f4f552a47efa4566d1983574e75bc85595 /third_party | |
| parent | 0e2fcb857cf4c6230fc3aa213f6a0b0b4f644fd0 (diff) | |
| download | chromium_org-58e6fbe4ee35d65e14b626c557d37565bf8ad179.tar.gz | |
Merge from Chromium at DEPS revision r213780
This commit was generated by merge_to_master.py.
Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 45d5fd920a..8bb8b5f128 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -107,7 +107,7 @@ 'ANDROID', ], }], - ['os_posix == 1', { + ['os_posix==1', { 'defines': [ 'POSIX', ], @@ -127,6 +127,11 @@ 'FREEBSD', ], }], + ['chromeos==1', { + 'defines': [ + 'CHROMEOS', + ], + }], ], }, 'all_dependent_settings': { |