summaryrefslogtreecommitdiffstats
path: root/app/app.gyp
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 21:15:06 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 21:15:06 +0000
commitfd1d6998e6a96569e478c87220f6825a3e47851c (patch)
tree0f2e2d2e174c20c4eb7366b2d678f58d8aaa633c /app/app.gyp
parent01bfd02b5e75ad54e90c5379da3a84c714c79bf6 (diff)
downloadchromium_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 'app/app.gyp')
-rw-r--r--app/app.gyp50
1 files changed, 0 insertions, 50 deletions
diff --git a/app/app.gyp b/app/app.gyp
index a0bccad..dcabe1d 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -163,56 +163,6 @@
}],
],
},
- {
- 'target_name': 'app_id',
- 'type': 'none',
- 'msvs_guid': '83100055-172B-49EA-B422-B1A92B627D37',
- 'conditions': [
- ['OS=="win"',
- {
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/app_id',
- ],
- },
- 'actions': [
- {
- 'action_name': 'appid',
- 'variables': {
- 'appid_py': '../chrome/tools/build/appid.py',
- },
- 'conditions': [
- [ 'branding=="Chrome"', {
- 'variables': {
- 'appid_value': '<(google_update_appid)',
- },
- }, { # else
- 'variables': {
- 'appid_value': '',
- },
- }],
- ],
- 'inputs': [
- '<(appid_py)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/app_id/appid.h',
- 'tools/build/_always_run_appid_py.marker',
- ],
- 'action': [
- 'python',
- '<(appid_py)',
- '-a', '<(appid_value)',
- '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome/app_id/appid.h',
- ],
- 'process_outputs_as_sources': 1,
- 'message': 'Generating appid information in <(SHARED_INTERMEDIATE_DIR)/chrome/appid.h'
- },
- ],
- },
- ],
- ],
- },
],
}