From 4f97280e6b2e0f2eab7fb3f504be1d85f5649a76 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Tue, 22 Jun 2010 06:45:22 +0000 Subject: Load net-internals resources from resources.pak. This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50433 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_dll.gypi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'chrome/chrome_dll.gypi') diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 71863b1e..eced91f 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -445,7 +445,6 @@ '<(PRODUCT_DIR)/resources/gmail_app/', '<(PRODUCT_DIR)/resources/calendar_app/', '<(PRODUCT_DIR)/resources/docs_app/', - '<(PRODUCT_DIR)/resources/net_internals/' ], 'conditions': [ ['mac_breakpad==1', { @@ -482,6 +481,12 @@ }], ], }, + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(INTERMEDIATE_DIR)/repack/resources.pak' + ], + }, ], 'conditions': [ ['mac_breakpad==1', { -- cgit v1.1