Revert "Fix None target type with Ninja build."
This reverts r1883, which seems to be causing gyp-win32 bot failures on
test\ninja\solibs_avoid_relinking\gyptest-solibs-avoid-relinking.py and
test\win\gyptest-link-restat-importlib.py.
BUG=
TBR=etienneb@chromium.org,scottmg@chromium.org
Review URL: https://codereview.chromium.org/230633002
git-svn-id: http://gyp.googlecode.com/svn/trunk@1892 78cadc50-ecff-11dd-a971-7dbc132099af
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
index 8fa66fb..9408613 100644
--- a/pylib/gyp/generator/ninja.py
+++ b/pylib/gyp/generator/ninja.py
@@ -2140,8 +2140,6 @@
target_outputs[qualified_target] = target
if qualified_target in all_targets:
all_outputs.add(target.FinalOutput())
- else:
- target_short_names.setdefault(name, [])
if target_short_names:
# Write a short name to build this target. This benefits both the
diff --git a/test/ninja/none-rules/gyptest-none-rules.py b/test/ninja/none-rules/gyptest-none-rules.py
deleted file mode 100644
index bca031d..0000000
--- a/test/ninja/none-rules/gyptest-none-rules.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2014 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.
-
-"""
-Verify that 'none' targets produce valid ninja rules.
-"""
-
-import os
-import sys
-import TestCommon
-import TestGyp
-
-# This is a ninja-specific test.
-test = TestGyp.TestGyp(formats=['ninja'])
-
-test.run_gyp('none-rules.gyp')
-
-subninja = open(test.built_file_path('build.ninja')).read()
-if 'build doc: phony' not in subninja:
- test.fail_test()
-
-# Build the library.
-test.build('none-rules.gyp', 'doc')
diff --git a/test/ninja/none-rules/none-rules.gyp b/test/ninja/none-rules/none-rules.gyp
deleted file mode 100644
index be7dac5..0000000
--- a/test/ninja/none-rules/none-rules.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2014 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': 'doc',
- 'type': 'none',
- 'sources': [],
- },
- ],
-}
