summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_strings.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 04:59:06 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 04:59:06 +0000
commitbdd509b41f76d278cb7194941ed0018a2b5edf36 (patch)
treebad9247c5a3006aad47190815dae9d7da13702f8 /device/bluetooth/bluetooth_strings.gyp
parentb9b8f9cf116b0608b3f3f19a99534c8e9221d876 (diff)
downloadchromium_src-bdd509b41f76d278cb7194941ed0018a2b5edf36.zip
chromium_src-bdd509b41f76d278cb7194941ed0018a2b5edf36.tar.gz
chromium_src-bdd509b41f76d278cb7194941ed0018a2b5edf36.tar.bz2
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
Diffstat (limited to 'device/bluetooth/bluetooth_strings.gyp')
-rw-r--r--device/bluetooth/bluetooth_strings.gyp11
1 files changed, 3 insertions, 8 deletions
diff --git a/device/bluetooth/bluetooth_strings.gyp b/device/bluetooth/bluetooth_strings.gyp
index 4bf3a30..8b9dca9 100644
--- a/device/bluetooth/bluetooth_strings.gyp
+++ b/device/bluetooth/bluetooth_strings.gyp
@@ -8,23 +8,18 @@
'target_name': 'device_bluetooth_strings',
'type': 'none',
'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
},
'actions': [
{
- 'action_name': 'device_bluetooth_strings',
+ 'action_name': 'generate_device_bluetooth_strings',
'variables': {
'grit_grd_file': 'bluetooth_strings.grd',
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
},
'includes': [ '../../build/grit_action.gypi' ],
},
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
- ],
- },
+ 'includes': [ '../../build/grit_target.gypi' ],
},
],
}