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

Side by Side Diff: chrome/chrome_installer_util.gypi

Issue 8538016: Revert 109534 since this change broke clobbered component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'installer_util_target': 0, 8 'installer_util_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 ['OS=="win"', { 90 ['OS=="win"', {
91 'targets': [ 91 'targets': [
92 { 92 {
93 'target_name': 'installer_util', 93 'target_name': 'installer_util',
94 'type': 'static_library', 94 'type': 'static_library',
95 'variables': { 95 'variables': {
96 'installer_util_target': 1, 96 'installer_util_target': 1,
97 }, 97 },
98 'dependencies': [ 98 'dependencies': [
99 'installer_util_strings', 99 'installer_util_strings',
100 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
100 'common_constants', 101 'common_constants',
101 'chrome_resources.gyp:chrome_resources', 102 'chrome_resources.gyp:chrome_resources',
102 'chrome_resources.gyp:chrome_strings', 103 'chrome_resources.gyp:chrome_strings',
104 '../content/content.gyp:content_common',
103 '<(DEPTH)/base/base.gyp:base', 105 '<(DEPTH)/base/base.gyp:base',
104 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', 106 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations',
105 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
106 '<(DEPTH)/content/content.gyp:content_common',
107 '<(DEPTH)/courgette/courgette.gyp:courgette_lib', 107 '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
108 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', 108 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
109 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 109 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
110 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 110 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
111 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', 111 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
112 ], 112 ],
113 'sources': [ 113 'sources': [
114 'installer/util/chrome_browser_operations.cc', 114 'installer/util/chrome_browser_operations.cc',
115 'installer/util/chrome_browser_operations.h', 115 'installer/util/chrome_browser_operations.h',
116 'installer/util/chrome_browser_sxs_operations.cc', 116 'installer/util/chrome_browser_sxs_operations.cc',
(...skipping 17 matching lines...) Expand all
134 'installer/util/master_preferences.cc', 134 'installer/util/master_preferences.cc',
135 'installer/util/master_preferences.h', 135 'installer/util/master_preferences.h',
136 'installer/util/product.h', 136 'installer/util/product.h',
137 'installer/util/product.cc', 137 'installer/util/product.cc',
138 'installer/util/product_operations.h', 138 'installer/util/product_operations.h',
139 'installer/util/self_cleaning_temp_dir.cc', 139 'installer/util/self_cleaning_temp_dir.cc',
140 'installer/util/self_cleaning_temp_dir.h', 140 'installer/util/self_cleaning_temp_dir.h',
141 'installer/util/shell_util.cc', 141 'installer/util/shell_util.cc',
142 'installer/util/shell_util.h', 142 'installer/util/shell_util.h',
143 ], 143 ],
144 'conditions': [
145 ['component == "shared_library"', {
146 'sources': [ '../content/public/common/content_switches.cc' ],
147 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
148 }, {
149 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
150 }],
151 ],
152 }, 144 },
153 { 145 {
154 'target_name': 'installer_util_nacl_win64', 146 'target_name': 'installer_util_nacl_win64',
155 'type': 'static_library', 147 'type': 'static_library',
156 'variables': { 148 'variables': {
157 'installer_util_target': 1, 149 'installer_util_target': 1,
158 }, 150 },
159 'dependencies': [ 151 'dependencies': [
160 'installer_util_strings', 152 'installer_util_strings',
161 ], 153 ],
(...skipping 25 matching lines...) Expand all
187 ], 179 ],
188 'sources': [ 180 'sources': [
189 'installer/util/master_preferences.cc', 181 'installer/util/master_preferences.cc',
190 'installer/util/master_preferences.h', 182 'installer/util/master_preferences.h',
191 'installer/util/master_preferences_constants.cc', 183 'installer/util/master_preferences_constants.cc',
192 'installer/util/master_preferences_constants.h', 184 'installer/util/master_preferences_constants.h',
193 ], 185 ],
194 'include_dirs': [ 186 'include_dirs': [
195 '<(DEPTH)', 187 '<(DEPTH)',
196 ], 188 ],
197 'conditions': [
198 ['component == "shared_library"', {
199 'sources': [ '../content/public/common/content_switches.cc' ],
200 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
201 }],
202 ],
203 } 189 }
204 ], 190 ],
205 }], 191 }],
206
207 ], 192 ],
208 } 193 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698