From 4ae76407bbc22f05c79b8255e8337ea0cc907dc2 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Tue, 22 Mar 2011 01:06:32 +0000 Subject: Revert "Load devtools files from resources.pak rather than from disk." interactive_ui_tests in debug appear to be broken. This reverts commit r78949. TBR=pfeldman Review URL: http://codereview.chromium.org/6675018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78954 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/tools/build/win/FILES | 1 + chrome/tools/build/win/FILES.cfg | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'chrome/tools') diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 825aa6c..73ce368 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -58,6 +58,7 @@ locales/uk.dll locales/vi.dll locales/zh-CN.dll locales/zh-TW.dll +resources resources.pak wow_helper.exe gcswf32.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 05739fc..c3b9c2e 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -311,6 +311,11 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'resources', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'resources.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], -- cgit v1.1