Make isimpledom write shared generated files to SHARED_INTERMEDIATE_DIR

BUG=97186
TEST=none


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

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

5 files changed, 17 insertions, 22 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 2ebbf56..5f22d00 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -33,6 +33,7 @@ include_rules = [
   "+third_party/cld",
   "+third_party/expat",
   "+third_party/iaccessible2",
+  "+third_party/isimpledom",
   "+third_party/libevent",  # For the remote V8 debugging server
   "+third_party/libjingle",
   "+third_party/protobuf/src/google/protobuf",
diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc
index c15223d..2daa4cd 100644
--- a/chrome/browser/accessibility/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc
@@ -19,7 +19,7 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/content_notification_types.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
-#include "ISimpleDOMNode.h"  // Generated   NOLINT
+#include "third_party/isimpledom/ISimpleDOMNode.h"
 
 using std::auto_ptr;
 using std::vector;
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 525e540..93d8254 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -3,6 +3,7 @@ include_rules = [
 
   # Other libraries.
   "+third_party/iaccessible2",
+  "+third_party/isimpledom",
 
   # DO NOT ADD ANY CHROME INCLUDES HERE!!!
   # See https://sites.google.com/a/chromium.org/dev/developers/content-module
diff --git a/content/browser/accessibility/browser_accessibility_win.h b/content/browser/accessibility/browser_accessibility_win.h
index 2e6e951..5edce45 100644
--- a/content/browser/accessibility/browser_accessibility_win.h
+++ b/content/browser/accessibility/browser_accessibility_win.h
@@ -13,10 +13,10 @@
 #include <vector>
 
 #include "content/browser/accessibility/browser_accessibility.h"
-#include "ISimpleDOMDocument.h"  // Generated NOLINT
-#include "ISimpleDOMNode.h"  // Generated NOLINT
-#include "ISimpleDOMText.h"  // Generated NOLINT
 #include "third_party/iaccessible2/ia2_api_all.h"
+#include "third_party/isimpledom/ISimpleDOMDocument.h"
+#include "third_party/isimpledom/ISimpleDOMNode.h"
+#include "third_party/isimpledom/ISimpleDOMText.h"
 #include "webkit/glue/webaccessibility.h"
 
 class BrowserAccessibilityManagerWin;
diff --git a/third_party/isimpledom/isimpledom.gyp b/third_party/isimpledom/isimpledom.gyp
index 61ba162..80a0089 100644
--- a/third_party/isimpledom/isimpledom.gyp
+++ b/third_party/isimpledom/isimpledom.gyp
@@ -3,41 +3,34 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    '../../build/common.gypi',
-  ],
-
-  'target_defaults': {
-    'include_dirs': [
-      '.',
-      '<(INTERMEDIATE_DIR)',
-    ],
-  },
   'targets': [
     {
       'target_name': 'isimpledom',
       'type': 'static_library',
+      'variables': {
+        'midl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/isimpledom',
+      },
       'sources': [
         'ISimpleDOMDocument.idl',
         'ISimpleDOMNode.idl',
         'ISimpleDOMText.idl',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMDocument.h',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMDocument_i.c',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMNode.h',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMNode_i.c',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMText.h',
-        '<(INTERMEDIATE_DIR)/ISimpleDOMText_i.c',
+        '<(midl_out_dir)/ISimpleDOMDocument.h',
+        '<(midl_out_dir)/ISimpleDOMDocument_i.c',
+        '<(midl_out_dir)/ISimpleDOMNode.h',
+        '<(midl_out_dir)/ISimpleDOMNode_i.c',
+        '<(midl_out_dir)/ISimpleDOMText.h',
+        '<(midl_out_dir)/ISimpleDOMText_i.c',
       ],
       'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
-          # Bit of a hack to work around the built in vstudio rule.
-          '<(INTERMEDIATE_DIR)/../isimpledom',
+          '<(SHARED_INTERMEDIATE_DIR)',
         ],
       },
       'msvs_settings': {
         'VCMIDLTool': {
           'GenerateTypeLibrary': 'false',
+          'OutputDirectory': '<(midl_out_dir)',
         },
       },
     },