summaryrefslogtreecommitdiffstats
path: root/chrome/installer/mini_installer.gyp
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 20:44:51 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 20:44:51 +0000
commitbd63ce0ad16cab9822d7120bdcf2d5b7353598e3 (patch)
treeaed796bf22fb22cf0a7ff1e6c12b151de3f5bf40 /chrome/installer/mini_installer.gyp
parent25da1685160963a14710a128977525ea55aee091 (diff)
downloadchromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.zip
chromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.tar.gz
chromium_src-bd63ce0ad16cab9822d7120bdcf2d5b7353598e3.tar.bz2
Integrate the Windows 8 code into the Chromium tree (take 3).
This time, also: fix invalid path in metro_driver.gyp. set executable bit on check_sdk_patch.py and post_build.bat. add back a switch that was removed recently This reverts "Revert 155429 - Integrate the Windows 8 code into the Chromium tree." Original CL: https://chromiumcodereview.appspot.com/10875008 BUG=127799 TEST=A Chromium build can run as the immersive browser on Windows 8. TBR=ben Review URL: https://chromiumcodereview.appspot.com/10919158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer.gyp')
-rw-r--r--chrome/installer/mini_installer.gyp7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 49084bc..4b94b89 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -272,13 +272,6 @@
},
],
}],
- [ 'mini_installer_internal_deps == 1 or mini_installer_official_deps == 1', {
- 'target_defaults': {
- 'dependencies': [
- 'mini_installer/support/mini_installer_support.gyp:*',
- ],
- },
- }],
[ 'branding == "Chrome"', {
'variables': {
'branding_dir': '../app/theme/google_chrome',