summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 23:22:38 +0000
committerscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 23:22:38 +0000
commitd6a297e4fd8ba7059b31a0d03b767fbbc67560cd (patch)
tree27c435efd34c43aa279aaa682d380be931e503f3
parent3c3a2f153abd198ab7d206b82033d912f9a7f55c (diff)
downloadchromium_src-d6a297e4fd8ba7059b31a0d03b767fbbc67560cd.zip
chromium_src-d6a297e4fd8ba7059b31a0d03b767fbbc67560cd.tar.gz
chromium_src-d6a297e4fd8ba7059b31a0d03b767fbbc67560cd.tar.bz2
delegate_execute should build on 2012 too
Just removing condition because 2008 is toast. BUG=143646 R=cpu@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/11184012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162280 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_exe.gypi2
-rw-r--r--win8/metro_driver/metro_driver.gyp2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 2fb228f..dcf8b71 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -515,7 +515,7 @@
['OS=="win" and component=="shared_library"', {
'defines': ['COMPILE_CONTENT_STATICALLY'],
}],
- ['OS=="win" and (MSVS_VERSION=="2010" or MSVS_VERSION=="2010e")', {
+ ['OS=="win"', {
'dependencies': [
'../win8/metro_driver/metro_driver.gyp:*',
'../win8/delegate_execute/delegate_execute.gyp:*',
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index e8f6481..2e61567 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -3,7 +3,7 @@
# found in the LICENSE file.
{
'conditions': [
- ['OS=="win" and (MSVS_VERSION=="2010" or MSVS_VERSION=="2010e")', {
+ ['OS=="win"', {
'variables': {
'chromium_code': 1,
},