summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_ios_bundle_resources.gypi
Commit message (Collapse)AuthorAgeFilesLines
* Generate chrome_300_percent.paklliabraa2014-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL updates chrome/chrome_resources.gyp to generate the chrome_300_percent.pak file (via the newly-added chrome/chrome_repack_chrome_300_percent.gypi). Several .grd files have been updated to generate the *_300_percent.pak files that are used to create chrome_300_percent.pak. This CL doesn't add any assets but grit complains if the necessary default_300_percent directories are not present so this CL adds placeholder files in these directories until real assets are added (which is tracked by crbug.com/423755). Since there are no assets in the *_300_percent directories, grit will fallback to using the 1x versions when generating the *_300_percent.pak files. Note that 300 percent support will be enabled in ui/base/resources by a subsequent CL (https://chromiumcodereview.appspot.com/646773004/). BUG=423762 Review URL: https://codereview.chromium.org/633373010 Cr-Commit-Position: refs/heads/master@{#300869}
* Remove chrome.pak references, build resources into resources.pak (try 2)jamesr@chromium.org2013-08-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | This puts resources that used to be in chrome.pak and/or compiled in to chrome.dll into resources.pak. resources.pak is already loaded at startup on all platforms so having some resources in a separate pak file isn't beneficial. This previously landed as https://codereview.chromium.org/22339020 and was reverted due to various scripts/etc still referencing chrome.pak. This patch still builds chrome.pak, but with only the (tiny) net_resources in it. After this lands I'll go remove references to chrome.pak and then remove it completely once all references are gone. BUG=52609 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218956 R=phajdan.jr@chromium.org, sky@chromium.org, tony@chromium.org Review URL: https://codereview.chromium.org/23205023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219226 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 218956 "Remove chrome.pak references, build resources int..."vabr@chromium.org2013-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seemes to have broken the mac buildbot. I'll post more info here soon, crbug.com does not seem to be working at the moment. > Remove chrome.pak references, build resources into resources.pak (try 2) > > This puts resources that used to be in chrome.pak and/or compiled in to > chrome.dll into resources.pak. resources.pak is already loaded at startup > on all platforms so having some resources in a separate pak file isn't > beneficial. > > This previously landed as https://codereview.chromium.org/22339020 and > was reverted due to various scripts/etc still referencing chrome.pak. This > patch still builds chrome.pak, but with only the (tiny) net_resources in > it. After this lands I'll go remove references to chrome.pak and then remove > it completely once all references are gone. > > BUG=52609 > TBR=phajdan.jr@chromium.org for chrome/installer/linux > > Review URL: https://chromiumcodereview.appspot.com/23205023 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/22807012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218975 0039d316-1c4b-4281-b951-d872f2087c98
* Remove chrome.pak references, build resources into resources.pak (try 2)jamesr@chromium.org2013-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | This puts resources that used to be in chrome.pak and/or compiled in to chrome.dll into resources.pak. resources.pak is already loaded at startup on all platforms so having some resources in a separate pak file isn't beneficial. This previously landed as https://codereview.chromium.org/22339020 and was reverted due to various scripts/etc still referencing chrome.pak. This patch still builds chrome.pak, but with only the (tiny) net_resources in it. After this lands I'll go remove references to chrome.pak and then remove it completely once all references are gone. BUG=52609 TBR=phajdan.jr@chromium.org for chrome/installer/linux Review URL: https://chromiumcodereview.appspot.com/23205023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218956 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 217346 "Remove chrome.pak references, build resources int..."dmazzoni@chromium.org2013-08-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Compile failures on main builders, not seen on try bots. > Remove chrome.pak references, build resources into resources.pak > > This puts resources that used to be in chrome.pak and/or compiled in to > chrome.dll into resources.pak. resources.pak is already loaded at startup > on all platforms so having some resources in a separate pak file isn't > beneficial. > > TBR=tony@chromium.org > > BUG=52609 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822 > > Review URL: https://codereview.chromium.org/22339020 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/22794013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217362 0039d316-1c4b-4281-b951-d872f2087c98
* Remove chrome.pak references, build resources into resources.pakjamesr@chromium.org2013-08-131-1/+0
| | | | | | | | | | | | | | | | | This puts resources that used to be in chrome.pak and/or compiled in to chrome.dll into resources.pak. resources.pak is already loaded at startup on all platforms so having some resources in a separate pak file isn't beneficial. TBR=tony@chromium.org BUG=52609 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822 Review URL: https://codereview.chromium.org/22339020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217346 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 216822 "Remove chrome.pak references, build resources int..."thestig@chromium.org2013-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Broke a variety of Linux, CrOS, and Android bots: ninja: error: 'gen/repack/chrome.pak', needed by 'chrome.pak', missing and no known rule to make it > Remove chrome.pak references, build resources into resources.pak > > This puts resources that used to be in chrome.pak and/or compiled in to > chrome.dll into resources.pak. resources.pak is already loaded at startup > on all platforms so having some resources in a separate pak file isn't > beneficial. > > R=tony > TBR=sky > > BUG=52609 > > Review URL: https://chromiumcodereview.appspot.com/22339020 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/22557005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216823 0039d316-1c4b-4281-b951-d872f2087c98
* Remove chrome.pak references, build resources into resources.pakjamesr@chromium.org2013-08-101-1/+0
| | | | | | | | | | | | | | | | This puts resources that used to be in chrome.pak and/or compiled in to chrome.dll into resources.pak. resources.pak is already loaded at startup on all platforms so having some resources in a separate pak file isn't beneficial. R=tony TBR=sky BUG=52609 Review URL: https://chromiumcodereview.appspot.com/22339020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216822 0039d316-1c4b-4281-b951-d872f2087c98
* Bundle resources into the unit_test target on iOSstuartmorgan@chromium.org2012-11-281-0/+16
On iOS, all resources used in tests must be bundled into the unit test target's app bundle (since the Mac approach of looking next to the binary in the build directory doesn't work since the app is copied to a simulator or device before being run). This creates a gypi that can be included in any target that needs pak files bundled on iOS (unit_tests, higher-level tests, the app, etc.), and uses it in unit_tests. BUG=None Review URL: https://chromiumcodereview.appspot.com/11412069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169913 0039d316-1c4b-4281-b951-d872f2087c98