Index: ui/ui.gyp |
diff --git a/ui/ui.gyp b/ui/ui.gyp |
index 478ff6fafb35f5d6f38e0cc1dcbc6376f5c114ca..69de51112bea9bd851f9bf54837063613423c45d 100644 |
--- a/ui/ui.gyp |
+++ b/ui/ui.gyp |
@@ -30,7 +30,7 @@ |
'../third_party/libpng/libpng.gyp:libpng', |
'../third_party/zlib/zlib.gyp:zlib', |
'base/strings/ui_strings.gyp:ui_strings', |
- 'gfx_resources', |
+ 'native_theme_resources', |
'<(libjpeg_gyp_path):libjpeg', |
], |
'defines': [ |
@@ -684,20 +684,30 @@ |
], |
}, |
{ |
- 'target_name': 'gfx_resources', |
+ 'target_name': 'native_theme_resources', |
'type': 'none', |
'variables': { |
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx', |
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme', |
}, |
'actions': [ |
{ |
- 'action_name': 'gfx_resources', |
+ 'action_name': 'native_theme_resources', |
'variables': { |
- 'grit_grd_file': 'gfx/gfx_resources.grd', |
+ 'grit_grd_file': 'base/native_theme/resources/native_theme_resources.grd', |
}, |
'includes': [ '../build/grit_action.gypi' ], |
}, |
], |
+ # gfx_resources.pak is used by DumpRenderTree. |
+ # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and |
+ # remove this. |
+ 'copies': [ { |
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/', |
+ 'files' : [ |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/gfx_resources.pak', |
+ ], |
+ }, |
+ ], |
'includes': [ '../build/grit_target.gypi' ], |
}, |
], |