diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:21:08 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:22:55 +0000 |
| commit | a9ca8d58432a4312b98a2e3bb0c90443bce839c6 (patch) | |
| tree | 0dce2736113888c0593ce6f8b771831e5caa583e /chrome/chrome_repack_chrome_100_percent.gypi | |
| parent | 89f18cdd70da96c028da681b0f7d594ac772d750 (diff) | |
| download | chromium_src-a9ca8d58432a4312b98a2e3bb0c90443bce839c6.zip chromium_src-a9ca8d58432a4312b98a2e3bb0c90443bce839c6.tar.gz chromium_src-a9ca8d58432a4312b98a2e3bb0c90443bce839c6.tar.bz2 | |
Move webkit resources over to content.
And while I'm at it, change the includes to use the qualified path for
the grit generated header file
($gen_dir/content/app/resources/grit/content_resources.h).
BUG=338338
TEST=None
R=avi@chromium.org,jamesr@chromium.org,thestig@chromium.org,tony@chromium.org
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/486573002
Cr-Commit-Position: refs/heads/master@{#291369}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome_100_percent.gypi')
| -rw-r--r-- | chrome/chrome_repack_chrome_100_percent.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 8f282d4..37ec654 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -14,7 +14,7 @@ 'conditions': [ ['OS != "ios"', { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', ], }], ['use_ash==1', { |