diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 19:20:20 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 19:20:20 +0000 |
| commit | 10955ac8846fedf178098b5318865711018eaa79 (patch) | |
| tree | f6184d15057120f4dc4e621d6bd744567f990c2c | |
| parent | 8bc79dfd1179cf87136702639b8e576395919034 (diff) | |
| download | chromium_src-10955ac8846fedf178098b5318865711018eaa79.zip chromium_src-10955ac8846fedf178098b5318865711018eaa79.tar.gz chromium_src-10955ac8846fedf178098b5318865711018eaa79.tar.bz2 | |
Add explicit generated API header dependencies to app_shell_lib.
Also add a missing generated proto dependency to content_browser.
It's not completely clear why this fixes this build; however, without it, app_shell_lib consistently fails to build from a clean build.
BUG=355443
Review URL: https://codereview.chromium.org/211323008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259654 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | apps/apps.gypi | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index 521bb5a..bead5d8 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -162,11 +162,13 @@ 'dependencies': [ 'app_shell_pak', 'apps', + 'common/extensions/api/api.gyp:chrome_api', 'test_support_common', '../base/base.gyp:base', '../base/base.gyp:base_prefs_test_support', '../content/content.gyp:content', '../content/content_shell_and_tests.gyp:content_shell_lib', + '../extensions/common/api/api.gyp:extensions_api', '../skia/skia.gyp:skia', '../ui/views/views.gyp:views', '../ui/wm/wm.gyp:wm_test_support', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index a7f067a..ee32b7d 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1643,6 +1643,7 @@ ['chromeos==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', + '../chromeos/chromeos.gyp:power_manager_proto', ], 'sources!': [ 'browser/geolocation/wifi_data_provider_linux.cc', |