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

Side by Side Diff: trunk/src/chrome/chrome_installer.gypi

Issue 422593002: Revert 285661 "Remove some dead app host code." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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
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 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 'installer/launcher_support/chrome_launcher_support.cc', 209 'installer/launcher_support/chrome_launcher_support.cc',
210 'installer/launcher_support/chrome_launcher_support.h', 210 'installer/launcher_support/chrome_launcher_support.h',
211 ], 211 ],
212 }, 212 },
213 { 213 {
214 'target_name': 'setup', 214 'target_name': 'setup',
215 'type': 'executable', 215 'type': 'executable',
216 'dependencies': [ 216 'dependencies': [
217 'installer_util', 217 'installer_util',
218 'installer_util_strings', 218 'installer_util_strings',
219 'launcher_support',
219 '../base/base.gyp:base', 220 '../base/base.gyp:base',
220 '../breakpad/breakpad.gyp:breakpad_handler', 221 '../breakpad/breakpad.gyp:breakpad_handler',
221 '../chrome/common_constants.gyp:common_constants', 222 '../chrome/common_constants.gyp:common_constants',
222 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', 223 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
223 '../rlz/rlz.gyp:rlz_lib', 224 '../rlz/rlz.gyp:rlz_lib',
224 '../third_party/zlib/zlib.gyp:zlib', 225 '../third_party/zlib/zlib.gyp:zlib',
225 ], 226 ],
226 'include_dirs': [ 227 'include_dirs': [
227 '..', 228 '..',
228 '<(INTERMEDIATE_DIR)', 229 '<(INTERMEDIATE_DIR)',
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 }, 324 },
324 }], 325 }],
325 ], 326 ],
326 }, 327 },
327 { 328 {
328 'target_name': 'setup_unittests', 329 'target_name': 'setup_unittests',
329 'type': 'executable', 330 'type': 'executable',
330 'dependencies': [ 331 'dependencies': [
331 'installer_util', 332 'installer_util',
332 'installer_util_strings', 333 'installer_util_strings',
334 'launcher_support',
333 '../base/base.gyp:base', 335 '../base/base.gyp:base',
334 '../base/base.gyp:base_i18n', 336 '../base/base.gyp:base_i18n',
335 '../base/base.gyp:test_support_base', 337 '../base/base.gyp:test_support_base',
336 '../testing/gmock.gyp:gmock', 338 '../testing/gmock.gyp:gmock',
337 '../testing/gtest.gyp:gtest', 339 '../testing/gtest.gyp:gtest',
338 ], 340 ],
339 'include_dirs': [ 341 'include_dirs': [
340 '..', 342 '..',
341 '<(INTERMEDIATE_DIR)', 343 '<(INTERMEDIATE_DIR)',
342 ], 344 ],
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1091 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1090 }, 1092 },
1091 }, { # else branding!="Chrome" 1093 }, { # else branding!="Chrome"
1092 'variables': { 1094 'variables': {
1093 'branding_dir': 'app/theme/chromium', 1095 'branding_dir': 'app/theme/chromium',
1094 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1096 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1095 }, 1097 },
1096 }], 1098 }],
1097 ], 1099 ],
1098 } 1100 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_browser_ui.gypi ('k') | trunk/src/chrome/installer/launcher_support/chrome_launcher_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698