From 755e1b73a0b4894ecc36401fd042c744e7837844 Mon Sep 17 00:00:00 2001
From: "erg@chromium.org"
 <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 24 Jun 2010 23:28:53 +0000
Subject: Reapply "Move the files in resources/shared/ into resources.pak"

Now with one line fix to fix the mac build.

BUG=35793,42770
TEST=none
TBR=tony

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50783 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome_dll.gypi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chrome/chrome_dll.gypi')

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 622971c0..cb91f9a 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -381,6 +381,7 @@
                     'pak_inputs': [
                       '<(grit_out_dir)/bookmark_manager_resources.pak',
                       '<(grit_out_dir)/net_internals_resources.pak',
+                      '<(grit_out_dir)/shared_resources.pak',
                     ],
                   },
                   'inputs': [
@@ -441,7 +442,6 @@
                   'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
                   'files': [
                     '<(PRODUCT_DIR)/resources/inspector/',
-                    '<(PRODUCT_DIR)/resources/shared/',
                     '<(PRODUCT_DIR)/resources/gmail_app/',
                     '<(PRODUCT_DIR)/resources/calendar_app/',
                     '<(PRODUCT_DIR)/resources/docs_app/',
-- 
cgit v1.1