summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp27
1 files changed, 15 insertions, 12 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index c2dfdde..ffd770c 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -118,7 +118,7 @@
'xulrunner_sdk',
],
'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'chrome_frame_histograms.h',
'chrome_frame_histograms.cc',
'chrome_frame_unittest_main.cc',
@@ -252,7 +252,7 @@
'npchrome_frame',
],
'sources': [
- '../base/test/test_suite.h',
+ '../base/test_suite.h',
'cfproxy_test.cc',
'external_tab_test.cc',
'test/automation_client_mock.cc',
@@ -289,7 +289,7 @@
'test/win_event_receiver.cc',
'test/win_event_receiver.h',
'chrome_launcher_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'test_utils.cc',
'test_utils.h',
],
@@ -364,12 +364,13 @@
'npchrome_frame',
],
'sources': [
+ '../base/perf_test_suite.h',
'../base/perftimer.cc',
'../base/test/test_file_util.h',
'../chrome/test/chrome_process_util.cc',
'../chrome/test/chrome_process_util.h',
'../chrome/test/ui/ui_test.cc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'test/chrome_frame_test_utils.cc',
'test/chrome_frame_test_utils.h',
'test/perf/chrome_frame_perftest.cc',
@@ -462,7 +463,7 @@
'test/net/test_automation_provider.h',
'test/net/test_automation_resource_message_filter.cc',
'test/net/test_automation_resource_message_filter.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'test_utils.cc',
'test_utils.h',
],
@@ -533,7 +534,7 @@
'test/simulate_input.h',
'test/win_event_receiver.cc',
'test/win_event_receiver.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'../base/test/test_file_util_win.cc',
'../chrome/test/automation/proxy_launcher.cc',
'../chrome/test/automation/proxy_launcher.h',
@@ -586,11 +587,10 @@
'chrome_frame_ie',
'chrome_frame_npapi',
'chrome_frame_strings',
- 'chrome_tab_idl',
'npchrome_frame',
],
'sources': [
- '../base/test/test_suite.h',
+ '../base/test_suite.h',
'test/chrome_frame_test_utils.cc',
'test/chrome_frame_test_utils.h',
'test/chrome_frame_ui_test_utils.cc',
@@ -610,7 +610,8 @@
'test/test_with_web_server.h',
'test/win_event_receiver.cc',
'test/win_event_receiver.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
+ 'chrome_tab.idl',
'renderer_glue.cc',
'test_utils.cc',
'test_utils.h',
@@ -785,7 +786,7 @@
'chrome_protocol.cc',
'chrome_protocol.h',
'chrome_protocol.rgs',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+ 'chrome_tab.h',
'com_message_event.cc',
'com_message_event.h',
'com_type_info_holder.cc',
@@ -966,8 +967,10 @@
'chrome_frame_reporting.h',
'chrome_tab.cc',
'chrome_tab.def',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.tlb',
+ 'chrome_tab.h',
+ # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
+ # figure out something more gyp-ish.
+ 'resources/tlb_resource.rc',
'chrome_tab.rgs',
'chrome_tab_version.rc',
'renderer_glue.cc',