summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfangjue23303@gmail.com <fangjue23303@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-03 00:21:35 +0000
committerfangjue23303@gmail.com <fangjue23303@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-03 00:21:35 +0000
commit1781603378a831520b216c9cd3b58c6ccb00f602 (patch)
treebfc1f685703ac8190b9ef83766a3ba971c3af961
parenta1c9cf82767f0c81c9fce7075d9452d85c2943d4 (diff)
downloadchromium_src-1781603378a831520b216c9cd3b58c6ccb00f602.zip
chromium_src-1781603378a831520b216c9cd3b58c6ccb00f602.tar.gz
chromium_src-1781603378a831520b216c9cd3b58c6ccb00f602.tar.bz2
Include common_resources and extensions_api_resources in chrome_child.dll
These resources are required for extensions code in the render process as well as the browser process. Without them, extensions won't work and it also causes crash in some cases. R=scottmg@chromium.org BUG=267150,267192,267266,267267,267268,267357 Review URL: https://chromiumcodereview.appspot.com/21732002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215420 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_dll.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 3ddb424..2c137d0 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -356,6 +356,8 @@
'CHROME_MULTIPLE_DLL_CHILD',
],
'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
'app/chrome_main.cc',
'app/chrome_main_delegate.cc',