diff options
| author | thestig <thestig@chromium.org> | 2014-10-31 17:51:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-01 00:52:23 +0000 |
| commit | da556afcb3defaa2c929797dbe09711d04279b79 (patch) | |
| tree | dfcd57b8007b3674df0481e1169562d4348fccfa /extensions/extensions_resources.gyp | |
| parent | 8c848c3f4b03bceab3e847f833afd0d6bd9dd4f5 (diff) | |
| download | chromium_src-da556afcb3defaa2c929797dbe09711d04279b79.zip chromium_src-da556afcb3defaa2c929797dbe09711d04279b79.tar.gz chromium_src-da556afcb3defaa2c929797dbe09711d04279b79.tar.bz2 | |
Cleanup: Remove most enable_extensions logic in extensions code.
They are no longer needed since nearly no extensions code gets built when extensions are disabled.
Review URL: https://codereview.chromium.org/672403002
Cr-Commit-Position: refs/heads/master@{#302369}
Diffstat (limited to 'extensions/extensions_resources.gyp')
| -rw-r--r-- | extensions/extensions_resources.gyp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp index 53c44dc..ed81dee 100644 --- a/extensions/extensions_resources.gyp +++ b/extensions/extensions_resources.gyp @@ -10,6 +10,9 @@ 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', }, + 'dependencies': [ + '../device/serial/serial.gyp:device_serial_mojo', + ], 'actions': [ { 'action_name': 'generate_extensions_resources', @@ -37,13 +40,6 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], - 'conditions': [ - ['enable_extensions==1', { - 'dependencies': [ - '../device/serial/serial.gyp:device_serial_mojo', - ], - }], - ], } ] } |