summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 02:33:32 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 02:33:32 +0000
commit09a0c16b6b6e9189aca7620e5d3bf1e1320478bf (patch)
tree86040692c4b7e88c4e9bd5adecc58478a262a923 /chrome
parentcc6e701be963178587b1e6edab1c74ec025ad9c0 (diff)
downloadchromium_src-09a0c16b6b6e9189aca7620e5d3bf1e1320478bf.zip
chromium_src-09a0c16b6b6e9189aca7620e5d3bf1e1320478bf.tar.gz
chromium_src-09a0c16b6b6e9189aca7620e5d3bf1e1320478bf.tar.bz2
Build fix attempt.
Parts by hbono. TBR=tony^work Review URL: http://codereview.chromium.org/2838044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chrome_dll.rc2
-rw-r--r--chrome/default_plugin/DEPS2
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index ab241c6..1ab9514 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -262,7 +262,7 @@ END
// We include these resources because all ICON types need to be in the
// same .rc file. See:
// http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx
-#include "webkit\\default_plugin\\default_plugin_resources.rc"
+#include "chrome\\default_plugin\\default_plugin_resources.rc"
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/default_plugin/DEPS b/chrome/default_plugin/DEPS
index a24c01b..c004887 100644
--- a/chrome/default_plugin/DEPS
+++ b/chrome/default_plugin/DEPS
@@ -1,4 +1,6 @@
include_rules = [
"+app",
+ "+grit", # For generated headers
"+third_party/libxml",
+ "+webkit/glue",
]