summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 18:21:36 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 18:21:36 +0000
commit72c40e69227f21d905fc917f02767a617e330e73 (patch)
tree2d0ca4ac068eecca510aa7cb90be3cc12f98d077 /chrome
parent5362213d5ffc32e2c4353ea2d85e432ea076bd46 (diff)
downloadchromium_src-72c40e69227f21d905fc917f02767a617e330e73.zip
chromium_src-72c40e69227f21d905fc917f02767a617e330e73.tar.gz
chromium_src-72c40e69227f21d905fc917f02767a617e330e73.tar.bz2
Fix official build due to 2x.pak reference
My Metro/HiDPI change (r133613) broke the official build. The problem was that I was referencing the new 2x pak files but they aren't created by default yet. Fix was to mark the references as optional. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10207021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/tools/build/win/FILES.cfg13
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 5a9aac6..c0c7a51 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -352,9 +352,16 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
+ 'filename': 'theme_resources_2x.pak',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'optional': ['dev', 'official'],
+ },
+ {
'filename': 'theme_resources_metro_1x.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
+ 'optional': ['dev', 'official'],
},
{
'filename': 'ui_resources_standard.pak',
@@ -362,6 +369,12 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
+ 'filename': 'ui_resources_2x.pak',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'optional': ['dev', 'official'],
+ },
+ {
'filename': 'wow_helper.exe',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],