Commit bdd509b4 authored by tfarina@chromium.org's avatar tfarina@chromium.org

Cleanup: Remove unnecessary uses of direct_dependent_settings.

build/grit_target.gypi does this for us, clients/consumers just need to define grit_out_dir variable and include grit_target.gypi for the magic happen.

Found these entries with the following command line:

$ for f in $(g ls-files | grep resources.gyp); do grep direct $f; echo $f;
done
$ for f in $(g ls-files | grep strings.gyp); do grep direct $f; echo $f;
done

BUG=None
TEST=None
TBR=keybuk@chromium.org,yoz@chromium.org,darin@chromium.org

keybuk for device/bluetooth/
yoz for extensions/
darin for webkit/

Review URL: https://codereview.chromium.org/389223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283646 0039d316-1c4b-4281-b951-d872f2087c98
parent b9b8f9cf
...@@ -8,23 +8,18 @@ ...@@ -8,23 +8,18 @@
'target_name': 'device_bluetooth_strings', 'target_name': 'device_bluetooth_strings',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
}, },
'actions': [ 'actions': [
{ {
'action_name': 'device_bluetooth_strings', 'action_name': 'generate_device_bluetooth_strings',
'variables': { 'variables': {
'grit_grd_file': 'bluetooth_strings.grd', 'grit_grd_file': 'bluetooth_strings.grd',
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
}, },
'includes': [ '../../build/grit_action.gypi' ], 'includes': [ '../../build/grit_action.gypi' ],
}, },
], ],
'direct_dependent_settings': { 'includes': [ '../../build/grit_target.gypi' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
],
},
}, },
], ],
} }
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
}, },
'actions': [ 'actions': [
{ {
'action_name': 'extensions_resources', 'action_name': 'generate_extensions_resources',
'variables': { 'variables': {
'grit_grd_file': 'extensions_resources.grd', 'grit_grd_file': 'extensions_resources.grd',
}, },
'includes': [ '../build/grit_action.gypi' ], 'includes': [ '../build/grit_action.gypi' ],
}, },
{ {
'action_name': 'extensions_renderer_resources', 'action_name': 'generate_extensions_renderer_resources',
'variables': { 'variables': {
'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd', 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd',
}, },
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
}, },
], ],
'includes': [ '../build/grit_target.gypi' ], 'includes': [ '../build/grit_target.gypi' ],
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/extensions',
]
},
'hard_dependency': 1,
} }
] ]
} }
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
}, },
], ],
'includes': [ '../build/grit_target.gypi' ], 'includes': [ '../build/grit_target.gypi' ],
'direct_dependent_settings': {
'include_dirs': [ '<(grit_out_dir)' ],
},
}, },
{ {
# GN version: //webkit:strings # GN version: //webkit:strings
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment