diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
| commit | fd1d6998e6a96569e478c87220f6825a3e47851c (patch) | |
| tree | 0f2e2d2e174c20c4eb7366b2d678f58d8aaa633c /chrome_frame/rename_me_to_supplement.gypi | |
| parent | 01bfd02b5e75ad54e90c5379da3a84c714c79bf6 (diff) | |
| download | chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.zip chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.gz chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.bz2 | |
Adding a secondary mini_installer target for Chrome Frame. This will remove the need to have different build scripts to build either Chrome or Chrome Frame.
Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'.
BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution.
TEST=none
Review URL: http://codereview.chromium.org/542078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/rename_me_to_supplement.gypi')
| -rw-r--r-- | chrome_frame/rename_me_to_supplement.gypi | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/chrome_frame/rename_me_to_supplement.gypi b/chrome_frame/rename_me_to_supplement.gypi deleted file mode 100644 index bdc9ae9..0000000 --- a/chrome_frame/rename_me_to_supplement.gypi +++ /dev/null @@ -1,29 +0,0 @@ -# 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, - }, -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: |