Revert "I need this change to create Windows 8.1/Windows Phone 8.1 projects that compile modules that can be consumed by Windows Store Applications (WinRT)."

This reverts commit 397b1c684b0b07a38f485f091cc4394a3d733334.

Failing on win64 bots per http://build.chromium.org/p/tryserver.nacl/builders/gyp-win64/builds/1896

BUG=

Review URL: https://codereview.chromium.org/596023003

git-svn-id: http://gyp.googlecode.com/svn/trunk@1983 78cadc50-ecff-11dd-a971-7dbc132099af

6 files changed, 10 insertions, 149 deletions

diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
index 517ce3c6..80e3104f 100644
--- a/pylib/gyp/generator/msvs.py
+++ b/pylib/gyp/generator/msvs.py
@@ -83,9 +83,6 @@ generator_additional_non_configuration_keys = [
     'msvs_external_builder_build_cmd',
     'msvs_external_builder_clean_cmd',
     'msvs_external_builder_clcompile_cmd',
-    'msvs_enable_winrt',
-    'msvs_requires_importlibrary',
-    'msvs_enable_winphone',
 ]
 
 
@@ -2598,26 +2595,15 @@ def _GetMSBuildProjectConfigurations(configurations):
 
 def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
   namespace = os.path.splitext(gyp_file_name)[0]
-  properties = [
+  return [
       ['PropertyGroup', {'Label': 'Globals'},
-        ['ProjectGuid', guid],
-        ['Keyword', 'Win32Proj'],
-        ['RootNamespace', namespace],
-        ['IgnoreWarnCompileDuplicatedFilename', 'true'],
+       ['ProjectGuid', guid],
+       ['Keyword', 'Win32Proj'],
+       ['RootNamespace', namespace],
+       ['IgnoreWarnCompileDuplicatedFilename', 'true'],
       ]
-    ]
-
-  if spec.get('msvs_enable_winrt'):
-    properties[0].append(['DefaultLanguage', 'en-US'])
-    properties[0].append(['AppContainerApplication', 'true'])
-    properties[0].append(['ApplicationTypeRevision', '8.1'])
-
-    if spec.get('msvs_enable_winphone'):
-      properties[0].append(['ApplicationType', 'Windows Phone'])
-    else:
-      properties[0].append(['ApplicationType', 'Windows Store'])
+  ]
 
-  return properties
 
 def _GetMSBuildConfigurationDetails(spec, build_file):
   properties = {}
@@ -2628,9 +2614,8 @@ def _GetMSBuildConfigurationDetails(spec, build_file):
     _AddConditionalProperty(properties, condition, 'ConfigurationType',
                             msbuild_attributes['ConfigurationType'])
     if character_set:
-      if 'msvs_enable_winrt' not in spec :
-        _AddConditionalProperty(properties, condition, 'CharacterSet',
-                                character_set)
+      _AddConditionalProperty(properties, condition, 'CharacterSet',
+                              character_set)
   return _GetMSBuildPropertyGroup(spec, 'Configuration', properties)
 
 
@@ -2989,13 +2974,6 @@ def _FinalizeMSBuildSettings(spec, configuration):
                 'PrecompiledHeaderFile', precompiled_header)
     _ToolAppend(msbuild_settings, 'ClCompile',
                 'ForcedIncludeFiles', [precompiled_header])
-  else:
-    _ToolAppend(msbuild_settings, 'ClCompile', 'PrecompiledHeader', 'NotUsing')
-  # Turn off WinRT compilation
-  _ToolAppend(msbuild_settings, 'ClCompile', 'CompileAsWinRT', 'false')
-  # Turn on import libraries if appropriate
-  if spec.get('msvs_requires_importlibrary'):
-   _ToolAppend(msbuild_settings, '', 'IgnoreImportLibrary', 'false')
   # Loadable modules don't generate import libraries;
   # tell dependent projects to not expect one.
   if spec['type'] == 'loadable_module':
@@ -3236,10 +3214,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
   content += _GetMSBuildGlobalProperties(spec, project.guid, project_file_name)
   content += import_default_section
   content += _GetMSBuildConfigurationDetails(spec, project.build_file)
-  if spec.get('msvs_enable_winphone'):
-   content += _GetMSBuildLocalProperties('v120_wp81')
-  else:
-   content += _GetMSBuildLocalProperties(project.msbuild_toolset)
+  content += _GetMSBuildLocalProperties(project.msbuild_toolset)
   content += import_cpp_props_section
   content += _GetMSBuildExtensions(props_files_of_rules)
   content += _GetMSBuildPropertySheets(configurations)
diff --git a/test/win/enable-winrt/dllmain.cc b/test/win/enable-winrt/dllmain.cc
deleted file mode 100644
index dedd83c3..00000000
--- a/test/win/enable-winrt/dllmain.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2013 Google Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <windows.h>
-#include <wrl.h>
-#include <wrl/wrappers/corewrappers.h>
-#include <windows.graphics.display.h>
-
-using namespace Microsoft::WRL;
-using namespace Microsoft::WRL::Wrappers;
-using namespace ABI::Windows::Foundation;
-using namespace ABI::Windows::Graphics::Display;
-
-bool TryToUseSomeWinRT() {
-  ComPtr<IDisplayPropertiesStatics> dp;
-  HStringReference s(RuntimeClass_Windows_Graphics_Display_DisplayProperties);
-  HRESULT hr = GetActivationFactory(s.Get(), dp.GetAddressOf());
-  if (SUCCEEDED(hr)) {
-    float dpi = 96.0f;
-    if (SUCCEEDED(dp->get_LogicalDpi(&dpi))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) {
-  return TRUE;
-}
diff --git a/test/win/enable-winrt/enable-winrt.gyp b/test/win/enable-winrt/enable-winrt.gyp
deleted file mode 100644
index 466fff90..00000000
--- a/test/win/enable-winrt/enable-winrt.gyp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2013 Google Inc. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [
-    {
-      'target_name': 'enable_winrt_dll',
-      'type': 'shared_library',
-      'msvs_enable_winrt': 1,
-      'sources': [
-        'dllmain.cc',
-      ],
-    },
-    {
-      'target_name': 'enable_winrt_missing_dll',
-      'type': 'shared_library',
-      'sources': [
-        'dllmain.cc',
-      ],
-    },
-    {
-      'target_name': 'enable_winrt_winphone_dll',
-      'type': 'shared_library',
-      'msvs_enable_winrt': 1,
-      'msvs_enable_winphone': 1,
-      'sources': [
-        'dllmain.cc',
-      ],
-      'msvs_settings':
-      {
-         'VCLinkerTool':
-         {
-            'AdditionalDependencies':
-            [
-                '%(AdditionalDependencies)',
-            ],
-         },
-      },
-    },
-  ]
-}
diff --git a/test/win/gyptest-link-enable-winrt.py b/test/win/gyptest-link-enable-winrt.py
deleted file mode 100644
index 2dc4860f..00000000
--- a/test/win/gyptest-link-enable-winrt.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2013 Google Inc. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Make sure msvs_enable_winrt works correctly.
-"""
-
-import TestGyp
-
-import struct
-import sys
-
-
-CHDIR = 'enable-winrt'
-
-if sys.platform == 'win32':
-  test = TestGyp.TestGyp(formats=['msvs'])
-
-  test.run_gyp('enable-winrt.gyp', chdir=CHDIR)
-
-  test.build('enable-winrt.gyp', 'enable_winrt_dll', chdir=CHDIR)
-
-  test.build('enable-winrt.gyp', 'enable_winrt_missing_dll', chdir=CHDIR,
-             status=1)
-
-  test.build('enable-winrt.gyp', 'enable_winrt_winphone_dll', chdir=CHDIR)
-
-  test.pass_test()
diff --git a/test/win/gyptest-link-target-machine.py b/test/win/gyptest-link-target-machine.py
index 477937df..5a15f3f4 100644
--- a/test/win/gyptest-link-target-machine.py
+++ b/test/win/gyptest-link-target-machine.py
@@ -18,12 +18,11 @@ if sys.platform == 'win32':
   CHDIR = 'linker-flags'
   test.run_gyp('target-machine.gyp', chdir=CHDIR)
   # The .cc file is compiled as x86 (the default), so the link/libs that are
-  # x64 or ARM need to fail.
+  # x64 need to fail.
   test.build('target-machine.gyp', 'test_target_link_x86', chdir=CHDIR)
   test.build(
       'target-machine.gyp', 'test_target_link_x64', chdir=CHDIR, status=1)
   test.build('target-machine.gyp', 'test_target_lib_x86', chdir=CHDIR)
   test.build('target-machine.gyp', 'test_target_lib_x64', chdir=CHDIR, status=1)
-  test.build('target-machine.gyp', 'test_target_lib_arm', chdir=CHDIR, status=1)
 
   test.pass_test()
diff --git a/test/win/linker-flags/target-machine.gyp b/test/win/linker-flags/target-machine.gyp
index 73719994..30271926 100644
--- a/test/win/linker-flags/target-machine.gyp
+++ b/test/win/linker-flags/target-machine.gyp
@@ -44,15 +44,5 @@
       },
       'sources': ['hello.cc'],
     },
-    {
-      'target_name': 'test_target_lib_arm',
-      'type': 'static_library',
-      'msvs_settings': {
-        'VCLibrarianTool': {
-          'TargetMachine': '3',
-        },
-      },
-      'sources': ['hello.cc'],
-    },
   ]
 }