diff options
| -rw-r--r-- | device/bluetooth/bluetooth_strings.gyp | 11 | ||||
| -rw-r--r-- | extensions/extensions_resources.gyp | 10 | ||||
| -rw-r--r-- | webkit/webkit_resources.gyp | 3 |
3 files changed, 5 insertions, 19 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' ], }, ], } diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp index dd0e1cd..8c56e20 100644 --- a/extensions/extensions_resources.gyp +++ b/extensions/extensions_resources.gyp @@ -12,14 +12,14 @@ }, 'actions': [ { - 'action_name': 'extensions_resources', + 'action_name': 'generate_extensions_resources', 'variables': { 'grit_grd_file': 'extensions_resources.grd', }, 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'extensions_renderer_resources', + 'action_name': 'generate_extensions_renderer_resources', 'variables': { 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd', }, @@ -27,12 +27,6 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/extensions', - ] - }, - 'hard_dependency': 1, } ] } diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp index f86317a..9cf6af8 100644 --- a/webkit/webkit_resources.gyp +++ b/webkit/webkit_resources.gyp @@ -28,9 +28,6 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], - 'direct_dependent_settings': { - 'include_dirs': [ '<(grit_out_dir)' ], - }, }, { # GN version: //webkit:strings |