diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 19:14:57 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 19:16:04 +0000 |
| commit | f5607906809bf7ba0ec1893ebbcd45ef7442a9b8 (patch) | |
| tree | b0f8389754f717d922538c1e77579568d9cd6517 /apps/apps.gypi | |
| parent | 36c762beb87b90eb289ef81c1262674531735d73 (diff) | |
| download | chromium_src-f5607906809bf7ba0ec1893ebbcd45ef7442a9b8.zip chromium_src-f5607906809bf7ba0ec1893ebbcd45ef7442a9b8.tar.gz chromium_src-f5607906809bf7ba0ec1893ebbcd45ef7442a9b8.tar.bz2 | |
Add apps to the GN build.
Remove duplicate reference of content_switches which causes link errors.
Add dependency on theme_resources from apps (it includes the generated file).
R=miket@chromium.org
Review URL: https://codereview.chromium.org/496763002
Cr-Commit-Position: refs/heads/master@{#291150}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index 73a288f..608b919 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -5,6 +5,7 @@ { 'targets': [ { + # GN version: //apps 'target_name': 'apps', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -15,6 +16,7 @@ # browser, then we can clean up these dependencies. 'dependencies': [ 'browser_extensions', + 'chrome_resources.gyp:theme_resources', 'common/extensions/api/api.gyp:chrome_api', '../skia/skia.gyp:skia', ], @@ -23,6 +25,7 @@ '<(grit_out_dir)', ], 'sources': [ + # Note: file list duplicated in GN build. 'app_lifetime_monitor.cc', 'app_lifetime_monitor.h', 'app_lifetime_monitor_factory.cc', |