| Index: chrome/chrome_resources.gyp
|
| diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
|
| index c41896f36be8c881ada127ae4dbe2a26e81038cd..8e3d4b2205bbd0412da2c340f4235f45dfc6f009 100644
|
| --- a/chrome/chrome_resources.gyp
|
| +++ b/chrome/chrome_resources.gyp
|
| @@ -112,19 +112,28 @@
|
| ],
|
| },
|
| ],
|
| - }],
|
| + }],
|
| ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
|
| - 'copies' : [
|
| - {
|
| - 'destination': '<(PRODUCT_DIR)/resources/chromeos/braille_ime',
|
| - 'files': [
|
| - 'browser/resources/chromeos/braille_ime/manifest.json',
|
| + 'conditions': [
|
| + ['use_chromevox_next==1', {
|
| + 'dependencies': [
|
| + 'browser/resources/chromeos/chromevox_next/chromevox.gyp:chromevox_resources',
|
| + 'chromevox_strings',
|
| ],
|
| - },
|
| - ],
|
| - 'dependencies': [
|
| - '../chrome/third_party/chromevox/chromevox.gyp:chromevox_resources',
|
| - 'chromevox_strings',
|
| + }, { # use_chromevox_next==0
|
| + 'copies' : [
|
| + {
|
| + 'destination': '<(PRODUCT_DIR)/resources/chromeos/braille_ime',
|
| + 'files': [
|
| + 'browser/resources/chromeos/braille_ime/manifest.json',
|
| + ],
|
| + },
|
| + ],
|
| + 'dependencies': [
|
| + '../chrome/third_party/chromevox/chromevox.gyp:chromevox_resources',
|
| + 'chromevox_strings',
|
| + ],
|
| + }],
|
| ],
|
| }],
|
| ],
|
|
|