diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 23:33:44 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 23:33:44 +0000 |
| commit | 398690f71a11c88625ae7ac151a54f8e3d076619 (patch) | |
| tree | 7e6b8d126edb7d672b4791c2f5d72e8cf356152f /chrome/installer | |
| parent | 355e590366988d3797e8545d428d19142603c740 (diff) | |
| download | chromium_src-398690f71a11c88625ae7ac151a54f8e3d076619.zip chromium_src-398690f71a11c88625ae7ac151a54f8e3d076619.tar.gz chromium_src-398690f71a11c88625ae7ac151a54f8e3d076619.tar.bz2 | |
Remove msvs_cygwin_shell:1 from chrome_installer.gypi
BUG=123026
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/140843013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/util/prebuild/create_string_rc.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py index 8ec589d..3b531e7 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py @@ -31,13 +31,12 @@ import os import sys from xml.dom import minidom -# We are expected to use ../../../../third_party/python_24/python.exe -from google import path_utils +BASEDIR = os.path.dirname(os.path.abspath(__file__)) +sys.path.append(os.path.join(BASEDIR, '../../../../tools/grit')) +sys.path.append(os.path.join(BASEDIR, '../../../../tools/python')) -# Quick hack to fix the path. -sys.path.append(os.path.abspath('../../tools/grit')) -sys.path.append(os.path.abspath('../tools/grit')) from grit.extern import tclib +from google import path_utils # The IDs of strings we want to import from generated_resources.grd and include # in setup.exe's resources. |