diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 00:24:14 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 00:24:14 +0000 |
| commit | 099282effdf12cdf091c8967c215eb3b6f4c4db6 (patch) | |
| tree | b8396f0f23364b98cf2ad12883c78aed079de010 /sync | |
| parent | 4288c546b6a7160cc11b104886b27d673a12004a (diff) | |
| download | chromium_src-099282effdf12cdf091c8967c215eb3b6f4c4db6.zip chromium_src-099282effdf12cdf091c8967c215eb3b6f4c4db6.tar.gz chromium_src-099282effdf12cdf091c8967c215eb3b6f4c4db6.tar.bz2 | |
Revert 190128 "Reland libjingle.gyp changes."
> Reland libjingle.gyp changes.
> The changes are the same as in the previous review:
> https://codereview.chromium.org/12457027/
>
> I had to revert due to build problems but eventually tracked
> them down to chromeos dependencies in sync. For 'sync', this
> is a problem for shared_library builds but not otherwise.
> For sync_unit_tests, this is a problem since sync_unit_tests
> is always built as an executable.
>
> Previously these problems were masked since the dependencies
> were being pulled in via libjingle.
>
> TBR=ronghuawu,akalin
>
> Review URL: https://codereview.chromium.org/12930010
TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/13009009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/sync.gyp | 13 | ||||
| -rw-r--r-- | sync/sync_tests.gypi | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index fad334dc..fb6476f 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -128,19 +128,6 @@ 'sync_notifier.gypi', 'sync_proto.gypi', ], - 'conditions': [ - # When building for chromeos, we pick up a dependency on - # libpeerconnection, which we must add here since we're building - # a shared lib. - # TODO(tommi): The chromeos dependency seems pretty broad. - # (see sync_core.gypi). See if we can't narrow that down to - # avoid this dependency. - ['chromeos==1 and enable_webrtc==1', { - 'dependencies': [ - '../third_party/libjingle/libjingle.gyp:libpeerconnection', - ], - }], - ], }, ], }], diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index ff97eaa..059c930 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -475,12 +475,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['chromeos==1', { - 'dependencies': [ - # This dependency gets picked up via chromeos dependencies. - '../media/media.gyp:media', - ], - }], ], }, ], |