diff options
| author | doloffd <doloffd@amazon.com> | 2015-03-12 15:30:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 22:31:21 +0000 |
| commit | e8f7dfcb412e4b51043ce5b5b10636dad03c1a40 (patch) | |
| tree | a82495f7ae85f978b4ea0f8b846bf21bae6c40ce /components | |
| parent | 398ff0bdf8f314a6f98d8d7ea348ea89d44aa7b3 (diff) | |
| download | chromium_src-e8f7dfcb412e4b51043ce5b5b10636dad03c1a40.zip chromium_src-e8f7dfcb412e4b51043ce5b5b10636dad03c1a40.tar.gz chromium_src-e8f7dfcb412e4b51043ce5b5b10636dad03c1a40.tar.bz2 | |
Expose the feedback gyp target to OS="Android"
Expose to Android so that any Chromium embedder can leverage the target. This
will not affect binary size since the target is not a dependency, the only
impact it will have is it will now be included in the 'all' target for Android.
BUG=464045
Review URL: https://codereview.chromium.org/979753004
Cr-Commit-Position: refs/heads/master@{#320393}
Diffstat (limited to 'components')
| -rw-r--r-- | components/BUILD.gn | 1 | ||||
| -rw-r--r-- | components/components.gyp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index 1765c1a..12e023a 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -164,7 +164,6 @@ group("all_components") { "//components/domain_reliability", # Blocked on content. "//components/favicon_base", # Should work, needs checking. "//components/favicon/core", # Blocked on keyed service. - "//components/feedback", # Blocked on content. "//components/gcm_driver", # Should work, needs checking. "//components/google/core/browser", # Should work, needs checking. "//components/history/core/browser", # Should work, needs checking. diff --git a/components/components.gyp b/components/components.gyp index 849b45f..bbf2571 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -29,6 +29,7 @@ 'error_page.gypi', 'favicon.gypi', 'favicon_base.gypi', + 'feedback.gypi', 'google.gypi', 'handoff.gypi', 'infobars.gypi', @@ -88,11 +89,6 @@ 'webp_transcode.gypi', ], }], - ['OS != "android"', { - 'includes': [ - 'feedback.gypi', - ] - }], ['OS != "ios" and OS != "android"', { 'includes': [ 'audio_modem.gypi', |