Index: chrome_frame/chrome_frame.gyp |
=================================================================== |
--- chrome_frame/chrome_frame.gyp (revision 72688) |
+++ chrome_frame/chrome_frame.gyp (working copy) |
@@ -155,7 +155,7 @@ |
'xulrunner_sdk', |
], |
'sources': [ |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'chrome_frame_histograms.h', |
'chrome_frame_histograms.cc', |
'chrome_frame_unittest_main.cc', |
@@ -290,7 +290,7 @@ |
'npchrome_frame', |
], |
'sources': [ |
- '../base/test_suite.h', |
+ '../base/test/test_suite.h', |
'cfproxy_test.cc', |
'external_tab_test.cc', |
'test/automation_client_mock.cc', |
@@ -327,7 +327,7 @@ |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
'chrome_launcher_version.rc', |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'test_utils.cc', |
'test_utils.h', |
], |
@@ -408,7 +408,7 @@ |
'../chrome/test/chrome_process_util.cc', |
'../chrome/test/chrome_process_util.h', |
'../chrome/test/ui/ui_test.cc', |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'test/chrome_frame_test_utils.cc', |
'test/chrome_frame_test_utils.h', |
'test/perf/chrome_frame_perftest.cc', |
@@ -500,7 +500,7 @@ |
'test/net/test_automation_provider.h', |
'test/net/test_automation_resource_message_filter.cc', |
'test/net/test_automation_resource_message_filter.h', |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
], |
'conditions': [ |
['OS=="win"', { |
@@ -569,7 +569,7 @@ |
'test/simulate_input.h', |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'../base/test/test_file_util_win.cc', |
'../chrome/test/automation/proxy_launcher.cc', |
'../chrome/test/automation/proxy_launcher.h', |
@@ -625,7 +625,7 @@ |
'npchrome_frame', |
], |
'sources': [ |
- '../base/test_suite.h', |
+ '../base/test/test_suite.h', |
'test/chrome_frame_test_utils.cc', |
'test/chrome_frame_test_utils.h', |
'test/chrome_frame_ui_test_utils.cc', |
@@ -645,8 +645,7 @@ |
'test/test_with_web_server.h', |
'test/win_event_receiver.cc', |
'test/win_event_receiver.h', |
- 'chrome_tab.h', |
- 'chrome_tab.idl', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'renderer_glue.cc', |
'test_utils.cc', |
'test_utils.h', |
@@ -822,7 +821,7 @@ |
'chrome_protocol.cc', |
'chrome_protocol.h', |
'chrome_protocol.rgs', |
- 'chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
'com_message_event.cc', |
'com_message_event.h', |
'com_type_info_holder.cc', |
@@ -1003,10 +1002,8 @@ |
'chrome_frame_reporting.h', |
'chrome_tab.cc', |
'chrome_tab.def', |
- 'chrome_tab.h', |
- # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can |
- # figure out something more gyp-ish. |
- 'resources/tlb_resource.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
+ '<(SHARED_INTERMEDIATE_DIR)/chromet_tab.tlb', |
'chrome_tab.rgs', |
'chrome_tab_version.rc', |
'renderer_glue.cc', |