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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 884013004: Fix setup_unittests compile break following r313626. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | 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 '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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 'installer/mini_installer/chrome_appid.cc', 352 'installer/mini_installer/chrome_appid.cc',
353 'installer/mini_installer/configuration.cc', 353 'installer/mini_installer/configuration.cc',
354 'installer/mini_installer/configuration.h', 354 'installer/mini_installer/configuration.h',
355 'installer/mini_installer/configuration_test.cc', 355 'installer/mini_installer/configuration_test.cc',
356 'installer/mini_installer/decompress.cc', 356 'installer/mini_installer/decompress.cc',
357 'installer/mini_installer/decompress.h', 357 'installer/mini_installer/decompress.h',
358 'installer/mini_installer/decompress_test.cc', 358 'installer/mini_installer/decompress_test.cc',
359 'installer/mini_installer/mini_string.cc', 359 'installer/mini_installer/mini_string.cc',
360 'installer/mini_installer/mini_string.h', 360 'installer/mini_installer/mini_string.h',
361 'installer/mini_installer/mini_string_test.cc', 361 'installer/mini_installer/mini_string_test.cc',
362 'installer/setup/app_launcher_installer.cc', # Move to lib
363 'installer/setup/app_launcher_installer.h', # Move to lib
362 'installer/setup/archive_patch_helper.cc', # Move to lib 364 'installer/setup/archive_patch_helper.cc', # Move to lib
363 'installer/setup/archive_patch_helper.h', # Move to lib 365 'installer/setup/archive_patch_helper.h', # Move to lib
364 'installer/setup/archive_patch_helper_unittest.cc', 366 'installer/setup/archive_patch_helper_unittest.cc',
365 'installer/setup/install.cc', # Move to lib 367 'installer/setup/install.cc', # Move to lib
366 'installer/setup/install.h', # Move to lib 368 'installer/setup/install.h', # Move to lib
367 'installer/setup/install_unittest.cc', 369 'installer/setup/install_unittest.cc',
368 'installer/setup/install_worker.cc', # Move to lib 370 'installer/setup/install_worker.cc', # Move to lib
369 'installer/setup/install_worker.h', # Move to lib 371 'installer/setup/install_worker.h', # Move to lib
370 'installer/setup/install_worker_unittest.cc', 372 'installer/setup/install_worker_unittest.cc',
371 'installer/setup/run_all_unittests.cc', 373 'installer/setup/run_all_unittests.cc',
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1098 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1097 }, 1099 },
1098 }, { # else branding!="Chrome" 1100 }, { # else branding!="Chrome"
1099 'variables': { 1101 'variables': {
1100 'branding_dir': 'app/theme/chromium', 1102 'branding_dir': 'app/theme/chromium',
1101 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1103 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1102 }, 1104 },
1103 }], 1105 }],
1104 ], 1106 ],
1105 } 1107 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698