diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-03-02 02:33:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 10:33:38 +0000 |
| commit | 4fb46b5b522e018429b2e40cf5f1c037c3ebbe19 (patch) | |
| tree | 4c3dcc6a260f774893bae64c72373720c223ea64 /components/components.gyp | |
| parent | 8747aee1f18410d8eaf0e2d98724c8e24477bdc2 (diff) | |
| download | chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.zip chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.tar.gz chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.tar.bz2 | |
Revert of Remove dependency on //components/feedback on iOS (patchset #1 id:1 of https://codereview.chromium.org/954943004/)
Reason for revert:
This CL cause the test to run in another order, causing a hidden dependency on the ordering to be visible. Reverting as this cause test failures.
See http://crbug.com/462352
Original issue's description:
> Remove dependency on //components/feedback on iOS
>
> iOS does not use //components/feedback to report feedback so remove
> the unused dependencies.
>
> BUG=None
>
> Committed: https://crrev.com/3e96329f442c10d73174688a4786ab847a49a37f
> Cr-Commit-Position: refs/heads/master@{#318211}
TBR=thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/968653004
Cr-Commit-Position: refs/heads/master@{#318674}
Diffstat (limited to 'components/components.gyp')
| -rw-r--r-- | components/components.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/components.gyp b/components/components.gyp index 17e4235..db6d9b0 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -88,11 +88,15 @@ 'webp_transcode.gypi', ], }], + ['OS != "android"', { + 'includes': [ + 'feedback.gypi', + ] + }], ['OS != "ios" and OS != "android"', { 'includes': [ 'audio_modem.gypi', 'copresence.gypi', - 'feedback.gypi', 'proximity_auth.gypi', 'storage_monitor.gypi', ] |