Rework how chrome_tab.idl is processed for chrome_frame. This is to avoid the compiler (at least in VS2010) from needlessly trying to rebuild what is fine.

BUG=71130
TEST=Clean compile & usual tests.

Review URL: http://codereview.chromium.org/6260049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73524 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 19 deletions

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index ffd770c..c2dfdde 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -118,7 +118,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',
@@ -252,7 +252,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',
@@ -289,7 +289,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',
       ],
@@ -364,13 +364,12 @@
         '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',
-        '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',
@@ -463,7 +462,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',
         'test_utils.cc',
         'test_utils.h',
       ],
@@ -534,7 +533,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',
@@ -587,10 +586,11 @@
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
+        'chrome_tab_idl',
         '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',
@@ -610,8 +610,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',
@@ -786,7 +785,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',
@@ -967,10 +966,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)/chrome_tab.tlb',
         'chrome_tab.rgs',
         'chrome_tab_version.rc',
         'renderer_glue.cc',
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index d357e88..b70dff0 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -134,6 +134,7 @@
       'msvs_guid': '5E80032F-7033-4661-9016-D98268244783',
       'dependencies': [
         '../chrome/chrome.gyp:chrome_version_header',
+        'chrome_frame.gyp:chrome_tab_idl',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -141,8 +142,7 @@
       ],
       'include_dirs': [
         # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-        '<(INTERMEDIATE_DIR)/../chrome_frame',
+        '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'bho_loader.cc',
@@ -152,8 +152,7 @@
         'chrome_frame_helper_util.cc',
         'chrome_frame_helper_util.h',
         'chrome_frame_helper_version.rc',
-        'chrome_tab.h',
-        'chrome_tab.idl',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'event_hooker.cc',
         'event_hooker.h',
         'iids.cc',