diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/apps | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/apps')
| -rw-r--r-- | chromium/apps/apps.gypi | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/chromium/apps/apps.gypi b/chromium/apps/apps.gypi index 7e2c179b488..9724dc61281 100644 --- a/chromium/apps/apps.gypi +++ b/chromium/apps/apps.gypi @@ -52,6 +52,8 @@ 'app_shim/extension_app_shim_handler_mac.h', 'app_window_contents.cc', 'app_window_contents.h', + 'apps_client.cc', + 'apps_client.h', 'field_trial_names.cc', 'field_trial_names.h', 'launcher.cc', @@ -95,45 +97,4 @@ 'msvs_disabled_warnings': [ 4267, ], }, ], - 'conditions': [ - ['OS=="win"', - { - 'targets': [ - { - 'target_name': 'app_host', - 'type': 'executable', - 'include_dirs': [ - '..', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, - 'dependencies': [ - '../base/base.gyp:base', - '../chrome/chrome.gyp:chrome_version_resources', - '../chrome/chrome.gyp:launcher_support', - '../google_update/google_update.gyp:google_update', - ], - 'sources': [ - 'app_host/app_host.rc', - 'app_host/app_host_main.cc', - 'app_host/app_host_resource.h', - 'app_host/binaries_installer.cc', - 'app_host/binaries_installer.h', - 'app_host/update.cc', - 'app_host/update.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome_version/app_host_exe_version.rc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - }, - }, - }, - ], - }, - ], # 'OS=="win"' - ], # 'conditions' } |