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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10458019: Reused target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_dll.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': [
11 ['OS=="win"', { 11 ['OS=="win"', {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'gcapi_dll', 14 'target_name': 'gcapi_dll',
15 'type': 'loadable_module', 15 'type': 'loadable_module',
16 'dependencies': [ 16 'dependencies': [
17 'installer_util', 17 'gcapi_lib',
18 '../base/base.gyp:base',
19 '../google_update/google_update.gyp:google_update',
20 ], 18 ],
21 'include_dirs': [ 19 'include_dirs': [
22 '..', 20 '..',
23 ], 21 ],
24 'sources': [ 22 'sources': [
25 'installer/gcapi/gcapi.cc',
26 'installer/gcapi/gcapi.def', 23 'installer/gcapi/gcapi.def',
27 'installer/gcapi/gcapi.h', 24 'installer/gcapi/gcapi_dll.cc',
28 'installer/gcapi/gcapi_omaha_experiment.cc',
29 'installer/gcapi/gcapi_omaha_experiment.h',
30 'installer/gcapi/gcapi_reactivation.cc',
31 'installer/gcapi/gcapi_reactivation.h',
32 ], 25 ],
33 }, 26 },
34 { 27 {
35 'target_name': 'gcapi_lib', 28 'target_name': 'gcapi_lib',
36 'type': 'static_library', 29 'type': 'static_library',
37 'dependencies': [ 30 'dependencies': [
38 'installer_util', 31 'installer_util',
39 '../base/base.gyp:base', 32 '../base/base.gyp:base',
40 '../google_update/google_update.gyp:google_update', 33 '../google_update/google_update.gyp:google_update',
41 ], 34 ],
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 'variables': { 1015 'variables': {
1023 'branding_dir': 'app/theme/google_chrome', 1016 'branding_dir': 'app/theme/google_chrome',
1024 }, 1017 },
1025 }, { # else branding!="Chrome" 1018 }, { # else branding!="Chrome"
1026 'variables': { 1019 'variables': {
1027 'branding_dir': 'app/theme/chromium', 1020 'branding_dir': 'app/theme/chromium',
1028 }, 1021 },
1029 }], 1022 }],
1030 ], 1023 ],
1031 } 1024 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/gcapi/gcapi_dll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698