summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 21:09:59 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 21:09:59 +0000
commit89c7d525496f23cfff48b816efc05a4122398202 (patch)
tree6e8c7db634af7d4f26021b748ca322f1a69c0aaf
parent1b0b119cdcdb93dc66f411c48e22cbeb05f33698 (diff)
downloadchromium_src-89c7d525496f23cfff48b816efc05a4122398202.zip
chromium_src-89c7d525496f23cfff48b816efc05a4122398202.tar.gz
chromium_src-89c7d525496f23cfff48b816efc05a4122398202.tar.bz2
app_shell: Fix resources.pak dependency issue
app_shell needs extensions-related feature JSON data, which is in resources.pak. Without that file app_shell will build normally but crash at runtime. BUG=none TEST=clean build of just the app_shell can launch normally R=miket@chromium.org, tony@chromium.org Review URL: https://codereview.chromium.org/131203008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244802 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--apps/apps.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 5813a3d..ba6b52c 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -109,6 +109,8 @@
'dependencies': [
'apps',
'chrome_resources.gyp:packed_resources',
+ # For resources.pak for features JSON files.
+ 'chrome_resources.gyp:packed_extra_resources',
'test_support_common',
'../base/base.gyp:base',
'../base/base.gyp:base_prefs_test_support',