diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 07:56:39 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 07:57:51 +0000 |
| commit | c4844325d770084cf1ad2632f934dec2e5dda97f (patch) | |
| tree | f4febb6b08dbcd7d010e07e163806c086c024a65 | |
| parent | bcfefe84639304b4c28398b4941fbd9384c4ec11 (diff) | |
| download | chromium_src-c4844325d770084cf1ad2632f934dec2e5dda97f.zip chromium_src-c4844325d770084cf1ad2632f934dec2e5dda97f.tar.gz chromium_src-c4844325d770084cf1ad2632f934dec2e5dda97f.tar.bz2 | |
Extensions: Do not depend on device_serial_mojo target when extensions are turned off.
BUG=334407
Review URL: https://codereview.chromium.org/472053004
Cr-Commit-Position: refs/heads/master@{#290121}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290121 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | extensions/BUILD.gn | 8 | ||||
| -rw-r--r-- | extensions/extensions.gyp | 4 | ||||
| -rw-r--r-- | extensions/extensions_resources.gyp | 10 |
3 files changed, 14 insertions, 8 deletions
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 5cb0f48..e48f6d3 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -32,9 +32,11 @@ grit("extensions_renderer_resources") { "extensions_renderer_resources.pak", ] grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ] - deps = [ - "//device/serial:serial_mojo", - ] + if (enable_extensions) { + deps = [ + "//device/serial:serial_mojo", + ] + } } source_set("test_support") { diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index e86b5b5..da1a341 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -20,8 +20,6 @@ '../components/components.gyp:url_matcher', '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', - # For Mojo generated headers for generated_api.cc. - '../device/serial/serial.gyp:device_serial_mojo', '../ipc/ipc.gyp:ipc', '../net/net.gyp:net', '../third_party/re2/re2.gyp:re2', @@ -216,6 +214,8 @@ 'conditions': [ ['enable_extensions==1', { 'dependencies': [ + # For Mojo generated headers for generated_api.cc. + '../device/serial/serial.gyp:device_serial_mojo', '../device/usb/usb.gyp:device_usb', ], 'sources!': [ diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp index 0a000ac..0cc93d0 100644 --- a/extensions/extensions_resources.gyp +++ b/extensions/extensions_resources.gyp @@ -7,9 +7,6 @@ { 'target_name': 'extensions_resources', 'type': 'none', - 'dependencies': [ - '../device/serial/serial.gyp:device_serial_mojo', - ], 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', }, @@ -33,6 +30,13 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], + 'conditions': [ + ['enable_extensions==1', { + 'dependencies': [ + '../device/serial/serial.gyp:device_serial_mojo', + ], + }], + ], } ] } |