summaryrefslogtreecommitdiffstats
path: root/chrome/installer/upgrade_test.gyp
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-06 22:01:31 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-06 22:01:31 +0000
commit81bf14642cc1362edcd4073c8ef6abbbaaf2cabe (patch)
tree82a054051c073f7c1161b4c4199069f883d69a99 /chrome/installer/upgrade_test.gyp
parent136279fd5c87eeac5d5566219ff01551deff9aac (diff)
downloadchromium_src-81bf14642cc1362edcd4073c8ef6abbbaaf2cabe.zip
chromium_src-81bf14642cc1362edcd4073c8ef6abbbaaf2cabe.tar.gz
chromium_src-81bf14642cc1362edcd4073c8ef6abbbaaf2cabe.tar.bz2
Add svn:eol-style to this .gyp file since if it checkos out in CRLF mode the build breaks.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/upgrade_test.gyp')
-rw-r--r--chrome/installer/upgrade_test.gyp132
1 files changed, 66 insertions, 66 deletions
diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
index fd5127a..b537c39 100644
--- a/chrome/installer/upgrade_test.gyp
+++ b/chrome/installer/upgrade_test.gyp
@@ -1,66 +1,66 @@
-{
- 'variables': {
- 'version_py': '../../chrome/tools/build/version.py',
- 'version_path': '../../chrome/VERSION',
- 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
- # 'branding_dir' is set in the 'conditions' section at the bottom.
- 'msvs_use_common_release': 0,
- 'msvs_use_common_linker_extras': 0,
- },
- 'conditions': [
- ['OS=="win"', {
- 'target_defaults': {
- },
- 'targets': [
- {
- 'target_name': 'upgrade_test',
- 'msvs_guid': 'BC4D6130-FDAD-47FB-B4FD-FCAF78DCBC3C',
- 'type': 'executable',
- 'dependencies': [
- # This dependency, although correct, results in the mini installer
- # being rebuilt every time upgrade_test is built. So disable it
- # for now.
- # TODO(grt): fix rules/targets/etc for
- # mini_installer.gyp:mini_installer so that it does no work if
- # nothing has changed, then un-comment this next line:
- # 'mini_installer.gyp:mini_installer',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
- '../chrome.gyp:common_constants',
- '../chrome.gyp:installer_util',
- ],
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- 'test/alternate_version_generator.cc',
- 'test/alternate_version_generator.h',
- 'test/pe_image_resources.cc',
- 'test/pe_image_resources.h',
- 'test/resource_loader.cc',
- 'test/resource_loader.h',
- 'test/resource_updater.cc',
- 'test/resource_updater.h',
- 'test/run_all_tests.cc',
- 'test/upgrade_test.cc',
- ],
- },
- ],
- }],
- [ 'branding == "Chrome"', {
- 'variables': {
- 'branding_dir': '../app/theme/google_chrome',
- },
- }, { # else branding!="Chrome"
- 'variables': {
- 'branding_dir': '../app/theme/chromium',
- },
- }],
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
+{
+ 'variables': {
+ 'version_py': '../../chrome/tools/build/version.py',
+ 'version_path': '../../chrome/VERSION',
+ 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+ # 'branding_dir' is set in the 'conditions' section at the bottom.
+ 'msvs_use_common_release': 0,
+ 'msvs_use_common_linker_extras': 0,
+ },
+ 'conditions': [
+ ['OS=="win"', {
+ 'target_defaults': {
+ },
+ 'targets': [
+ {
+ 'target_name': 'upgrade_test',
+ 'msvs_guid': 'BC4D6130-FDAD-47FB-B4FD-FCAF78DCBC3C',
+ 'type': 'executable',
+ 'dependencies': [
+ # This dependency, although correct, results in the mini installer
+ # being rebuilt every time upgrade_test is built. So disable it
+ # for now.
+ # TODO(grt): fix rules/targets/etc for
+ # mini_installer.gyp:mini_installer so that it does no work if
+ # nothing has changed, then un-comment this next line:
+ # 'mini_installer.gyp:mini_installer',
+ '../../base/base.gyp:test_support_base',
+ '../../testing/gtest.gyp:gtest',
+ '../chrome.gyp:common_constants',
+ '../chrome.gyp:installer_util',
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'sources': [
+ 'test/alternate_version_generator.cc',
+ 'test/alternate_version_generator.h',
+ 'test/pe_image_resources.cc',
+ 'test/pe_image_resources.h',
+ 'test/resource_loader.cc',
+ 'test/resource_loader.h',
+ 'test/resource_updater.cc',
+ 'test/resource_updater.h',
+ 'test/run_all_tests.cc',
+ 'test/upgrade_test.cc',
+ ],
+ },
+ ],
+ }],
+ [ 'branding == "Chrome"', {
+ 'variables': {
+ 'branding_dir': '../app/theme/google_chrome',
+ },
+ }, { # else branding!="Chrome"
+ 'variables': {
+ 'branding_dir': '../app/theme/chromium',
+ },
+ }],
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: