| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 57b70c0e8579f7a5539d25e6cf629d033f417bba..9e3ed8824981cd3f7915273171b53fa4c26b7cb7 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -31,6 +31,7 @@
|
| 'app/policy/cloud_policy_codegen.gyp:policy',
|
| 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../base/base.gyp:test_support_base',
|
| '../content/content.gyp:content_gpu',
|
| '../ipc/ipc.gyp:test_support_ipc',
|
| @@ -208,6 +209,7 @@
|
| 'chrome_resources',
|
| 'chrome_strings',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
| @@ -347,6 +349,7 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../base/base.gyp:base',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/libxml/libxml.gyp:libxml',
|
| @@ -533,6 +536,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
|
| @@ -2073,6 +2077,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
|
| @@ -2425,6 +2430,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
|
| # TODO(alekseys): port sidebar to linux/mac.
|
| @@ -2578,6 +2584,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
|
| ],
|
| @@ -2697,6 +2704,7 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| @@ -2799,6 +2807,7 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../base/base.gyp:base',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| @@ -2833,6 +2842,7 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../base/base.gyp:base',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| @@ -2862,6 +2872,7 @@
|
| 'test_support_common',
|
| 'test_support_ui',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../base/base.gyp:base',
|
| '../net/net.gyp:net',
|
| '../skia/skia.gyp:skia',
|
| @@ -3148,6 +3159,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| ],
|
| 'include_dirs': [
|
| '<(DEPTH)/third_party/wtl/include',
|
| @@ -3239,6 +3251,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
|
| + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
|
| @@ -3524,6 +3537,7 @@
|
| 'chrome_resources',
|
| 'chrome_strings',
|
| 'theme_resources',
|
| + 'theme_resources_standard',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
|
|