Make gyp_chromium.py work with Python 2.7.

gyp_chromium.py contained a Python 2.6 Windows bug workaround which turns out to be harmful with Python 2.7 since it will just include itself without doing anything.

BUG=
R=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202578 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 9 deletions

diff --git a/build/gyp_chromium.py b/build/gyp_chromium.py
index 29bac98..f9e8ac8 100644
--- a/build/gyp_chromium.py
+++ b/build/gyp_chromium.py
@@ -1,9 +1,18 @@
-# Copyright 2012 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-# This is a workaround for multiprocessing on Windows. Importing in Python on

-# Windows doesn't search for imports that don't end in .py (and aren't

-# directories with an __init__.py). So, add this wrapper to avoid having

-# people change their command line to add a .py when running gyp_chromium.

-__import__('gyp_chromium')

+# Copyright 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is (possibly, depending on python version) imported by
+# gyp_chromium when GYP_PARALLEL=1 and it creates sub-processes
+# through the multiprocessing library.
+
+# Importing in Python 2.6 (fixed in 2.7) on Windows doesn't search for
+# imports that don't end in .py (and aren't directories with an
+# __init__.py). This wrapper makes "import gyp_chromium" work with
+# those old versions and makes it possible to execute gyp_chromium.py
+# directly on Windows where the extension is useful.
+
+import os
+
+path = os.path.abspath(os.path.split(__file__)[0])
+execfile(os.path.join(path, 'gyp_chromium'))