diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 19:02:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 19:02:18 +0000 |
| commit | 7882985b55298d945dbcd16f2bbbdf82e8421f8a (patch) | |
| tree | 04fe23da45c3c3cab15574fa6a198acb557e613a | |
| parent | 9858541b91d0d0af8c8bac564a499135a7c21c87 (diff) | |
| download | chromium_src-7882985b55298d945dbcd16f2bbbdf82e8421f8a.zip chromium_src-7882985b55298d945dbcd16f2bbbdf82e8421f8a.tar.gz chromium_src-7882985b55298d945dbcd16f2bbbdf82e8421f8a.tar.bz2 | |
components: Update resources and strings to use grit_target.gypi.
This is just a small cleanup while I'm here and for being consistent
with other files of the same nature.
BUG=None
TEST=components_unittests
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/277573002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270161 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | components/components_resources.gyp | 6 | ||||
| -rw-r--r-- | components/components_strings.gyp | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/components/components_resources.gyp b/components/components_resources.gyp index 76a6128..376c9bb 100644 --- a/components/components_resources.gyp +++ b/components/components_resources.gyp @@ -27,12 +27,6 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], - - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/components', - ], - }, 'hard_dependency': 1, }, ], diff --git a/components/components_strings.gyp b/components/components_strings.gyp index 72555e7..facf651 100644 --- a/components/components_strings.gyp +++ b/components/components_strings.gyp @@ -7,21 +7,19 @@ { 'target_name': 'components_strings', 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/strings', + }, 'actions': [ { 'action_name': 'generate_components_strings', 'variables': { 'grit_grd_file': 'components_strings.grd', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/strings', }, 'includes': [ '../build/grit_action.gypi' ], }, ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/strings', - ], - }, + 'includes': [ '../build/grit_target.gypi' ], 'hard_dependency': 1, }, ], |