From 0805a91004c4fc262233e4a0eb61ad575a96c06d Mon Sep 17 00:00:00 2001 From: tdanderson Date: Wed, 5 Aug 2015 14:35:29 -0700 Subject: [PATCH] Include material design asset pak files for browser top chrome on Linux Modify installer files for Linux to include the files chrome_material_{100,200}_percent.pak, which contain image assets for top chrome material design. BUG=505798 TEST=none Review URL: https://codereview.chromium.org/1274773002 Cr-Commit-Position: refs/heads/master@{#341980} --- chrome/installer/linux/common/installer.include | 2 ++ chrome/tools/build/linux/FILES.cfg | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include index 7f4ef7705140..b0589429a08e 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -129,6 +129,8 @@ stage_install_common() { if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" install -m 644 "${BUILDDIR}/chrome_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" + install -m 644 "${BUILDDIR}/chrome_material_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" + install -m 644 "${BUILDDIR}/chrome_material_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" else install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index a118966c9e4a..fe95c116ca89 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -44,6 +44,14 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'chrome_material_100_percent.pak', + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'chrome_material_200_percent.pak', + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'chrome_sandbox', 'buildtype': ['dev', 'official'], }, -- 2.11.4.GIT