Commit c4844325 authored by thestig@chromium.org's avatar thestig@chromium.org

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
parent bcfefe84
...@@ -32,9 +32,11 @@ grit("extensions_renderer_resources") { ...@@ -32,9 +32,11 @@ grit("extensions_renderer_resources") {
"extensions_renderer_resources.pak", "extensions_renderer_resources.pak",
] ]
grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ] grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ]
deps = [ if (enable_extensions) {
"//device/serial:serial_mojo", deps = [
] "//device/serial:serial_mojo",
]
}
} }
source_set("test_support") { source_set("test_support") {
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
'../components/components.gyp:url_matcher', '../components/components.gyp:url_matcher',
'../content/content.gyp:content_common', '../content/content.gyp:content_common',
'../crypto/crypto.gyp:crypto', '../crypto/crypto.gyp:crypto',
# For Mojo generated headers for generated_api.cc.
'../device/serial/serial.gyp:device_serial_mojo',
'../ipc/ipc.gyp:ipc', '../ipc/ipc.gyp:ipc',
'../net/net.gyp:net', '../net/net.gyp:net',
'../third_party/re2/re2.gyp:re2', '../third_party/re2/re2.gyp:re2',
...@@ -216,6 +214,8 @@ ...@@ -216,6 +214,8 @@
'conditions': [ 'conditions': [
['enable_extensions==1', { ['enable_extensions==1', {
'dependencies': [ 'dependencies': [
# For Mojo generated headers for generated_api.cc.
'../device/serial/serial.gyp:device_serial_mojo',
'../device/usb/usb.gyp:device_usb', '../device/usb/usb.gyp:device_usb',
], ],
'sources!': [ 'sources!': [
......
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
{ {
'target_name': 'extensions_resources', 'target_name': 'extensions_resources',
'type': 'none', 'type': 'none',
'dependencies': [
'../device/serial/serial.gyp:device_serial_mojo',
],
'variables': { 'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions',
}, },
...@@ -33,6 +30,13 @@ ...@@ -33,6 +30,13 @@
}, },
], ],
'includes': [ '../build/grit_target.gypi' ], 'includes': [ '../build/grit_target.gypi' ],
'conditions': [
['enable_extensions==1', {
'dependencies': [
'../device/serial/serial.gyp:device_serial_mojo',
],
}],
],
} }
] ]
} }
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