| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 68dc2c87cec1eff0d9d26998d87999c95933c50e..3450b068befa53fc5e83f5813b452a06b3a71e5f 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -688,6 +688,7 @@
|
| # resulting .res files get referenced multiple times.
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| @@ -2156,6 +2157,14 @@
|
| '../v8/tools/gyp/v8.gyp:v8_shell#host',
|
| ],
|
| }],
|
| + ['enable_extensions==0', {
|
| + 'sources/': [
|
| + ['exclude', '^browser/extensions/api/'],
|
| + ['exclude', '^browser/extensions/extension_idle_api_unittest.cc'],
|
| + ['exclude', '^browser/extensions/extension_omnibox_unittest.cc'],
|
| + ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
|
| + ],
|
| + }],
|
| ['use_aura==1', {
|
| 'dependencies': [
|
| '../ui/aura/aura.gyp:test_support_aura',
|
| @@ -2402,6 +2411,7 @@
|
| # resulting .res files get referenced multiple times.
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| @@ -3228,6 +3238,7 @@
|
| 'sources': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| @@ -3477,6 +3488,7 @@
|
| 'sources': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| @@ -3612,6 +3624,7 @@
|
| 'sources': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| @@ -3960,6 +3973,7 @@
|
| 'sources': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
|
| @@ -4084,6 +4098,7 @@
|
| 'sources': [
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
|
|
|