Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10546149: Factor out logic to find chrome.exe from Omaha client state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use chrome from current dir in development. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/installer/gcapi/gcapi.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 12 matching lines...) Expand all
23 'installer/gcapi/gcapi.def', 23 'installer/gcapi/gcapi.def',
24 'installer/gcapi/gcapi_dll.cc', 24 'installer/gcapi/gcapi_dll.cc',
25 ], 25 ],
26 }, 26 },
27 { 27 {
28 'target_name': 'gcapi_lib', 28 'target_name': 'gcapi_lib',
29 'type': 'static_library', 29 'type': 'static_library',
30 'dependencies': [ 30 'dependencies': [
31 'installer_util', 31 'installer_util',
32 '../base/base.gyp:base', 32 '../base/base.gyp:base',
33 '../chrome/chrome.gyp:launcher_support',
33 '../google_update/google_update.gyp:google_update', 34 '../google_update/google_update.gyp:google_update',
34 ], 35 ],
35 'include_dirs': [ 36 'include_dirs': [
36 '..', 37 '..',
37 ], 38 ],
38 'sources': [ 39 'sources': [
39 'installer/gcapi/gcapi.cc', 40 'installer/gcapi/gcapi.cc',
40 'installer/gcapi/gcapi.h', 41 'installer/gcapi/gcapi.h',
41 'installer/gcapi/gcapi_omaha_experiment.cc', 42 'installer/gcapi/gcapi_omaha_experiment.cc',
42 'installer/gcapi/gcapi_omaha_experiment.h', 43 'installer/gcapi/gcapi_omaha_experiment.h',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 'sources': [ 165 'sources': [
165 'app/chromium_strings.grd', 166 'app/chromium_strings.grd',
166 ], 167 ],
167 'direct_dependent_settings': { 168 'direct_dependent_settings': {
168 'include_dirs': [ 169 'include_dirs': [
169 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', 170 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
170 ], 171 ],
171 }, 172 },
172 }, 173 },
173 { 174 {
175 'target_name': 'launcher_support',
176 'type': 'static_library',
177 'include_dirs': [
178 '..',
179 ],
180 'direct_dependent_settings': {
181 'include_dirs': [
182 '..',
183 ],
184 },
185 'dependencies': [
186 '<(DEPTH)/base/base.gyp:base',
187 ],
188 'sources': [
189 'installer/launcher_support/chrome_launcher_support.cc',
190 'installer/launcher_support/chrome_launcher_support.h',
191 ],
192 },
193 {
174 'target_name': 'mini_installer_test', 194 'target_name': 'mini_installer_test',
175 'type': 'executable', 195 'type': 'executable',
176 'dependencies': [ 196 'dependencies': [
177 'installer_util', 197 'installer_util',
178 'installer_util_strings', 198 'installer_util_strings',
179 '../base/base.gyp:base', 199 '../base/base.gyp:base',
180 '../base/base.gyp:base_i18n', 200 '../base/base.gyp:base_i18n',
181 '../base/base.gyp:test_support_base', 201 '../base/base.gyp:test_support_base',
182 '../chrome/chrome.gyp:test_support_common', 202 '../chrome/chrome.gyp:test_support_common',
183 '../testing/gtest.gyp:gtest', 203 '../testing/gtest.gyp:gtest',
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 'variables': { 1060 'variables': {
1041 'branding_dir': 'app/theme/google_chrome', 1061 'branding_dir': 'app/theme/google_chrome',
1042 }, 1062 },
1043 }, { # else branding!="Chrome" 1063 }, { # else branding!="Chrome"
1044 'variables': { 1064 'variables': {
1045 'branding_dir': 'app/theme/chromium', 1065 'branding_dir': 'app/theme/chromium',
1046 }, 1066 },
1047 }], 1067 }],
1048 ], 1068 ],
1049 } 1069 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/gcapi/gcapi.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698