diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:02:40 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:02:40 +0000 |
| commit | 82655be6b7e6b7eb87ab4436525bcc6b15453b31 (patch) | |
| tree | e59ebeda275b2057a37cc7e1d9b43ab3e30d8d23 | |
| parent | 34f8fee20dd1c07adcb4960310dd1f387d7b7bf3 (diff) | |
| download | chromium_src-82655be6b7e6b7eb87ab4436525bcc6b15453b31.zip chromium_src-82655be6b7e6b7eb87ab4436525bcc6b15453b31.tar.gz chromium_src-82655be6b7e6b7eb87ab4436525bcc6b15453b31.tar.bz2 | |
Remove the reference to Google Chrome branding from the supplement.gypi placeholder.
Convert line endings.
Remove vim cruft.
BUG=NONE
TEST=Can build Chrome Frame by renaming this file entirely from the external repository.
Review URL: http://codereview.chromium.org/270027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28449 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/rename_me_to_supplement.gypi | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/chrome_frame/rename_me_to_supplement.gypi b/chrome_frame/rename_me_to_supplement.gypi index ed7047c..085b224 100644 --- a/chrome_frame/rename_me_to_supplement.gypi +++ b/chrome_frame/rename_me_to_supplement.gypi @@ -1,30 +1,24 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# It is used to override the Chrome Frame appid, as well as
-# add extra required source files and defines. The file is checked in as
-# rename_me_to_supplement.gypi so as to not be active on the official builder.
-# This is required because with these fields present, Chrome will build in
-# Chrome Frame mode, which isn't what the Chrome official builder wants yet.
-#
-# Renaming this file to supplement.gypi will cause gyp to pick it up.
-# supplement.gypi is a magic gyp include file that gets pulled in before any
-# other includes.
-#
-# The official builder will define these extra vars and whatnot in the build
-# scripts themselves.
-{
- 'variables': {
- 'google_update_appid': '{8BA986DA-5100-405E-AA35-86F34A02ACBF}',
- 'extra_installer_util_sources': 0,
- 'branding': 'Chrome',
- 'chrome_frame_define': 1,
- },
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
+# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# It is used to override the Chrome Frame appid, as well as +# add extra required source files and defines. The file is checked in as +# rename_me_to_supplement.gypi so as to not be active on the official builder. +# This is required because with these fields present, Chrome will build in +# Chrome Frame mode, which isn't what the Chrome official builder wants yet. +# +# Renaming this file to supplement.gypi will cause gyp to pick it up. +# supplement.gypi is a magic gyp include file that gets pulled in before any +# other includes. +# +# The official builder will define these extra vars and whatnot in the build +# scripts themselves. +{ + 'variables': { + 'google_update_appid': '{8BA986DA-5100-405E-AA35-86F34A02ACBF}', + 'extra_installer_util_sources': 0, + 'chrome_frame_define': 1, + }, +} + |