Index: chrome/chrome_tests.gypi |
=================================================================== |
--- chrome/chrome_tests.gypi (revision 132590) |
+++ chrome/chrome_tests.gypi (working copy) |
@@ -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', |
@@ -3229,6 +3239,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', |
@@ -3478,6 +3489,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', |
@@ -3613,6 +3625,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', |
@@ -3961,6 +3974,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', |
@@ -4085,6 +4099,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', |