AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gyp_skia: Fix module search path.

Browse Source 
gyp_skia should prepend the local gyp source path to the python
module search path, instead of appending it. Otherwise, if a 'gyp'
module is locally installed on the machine, it will be read instead
of the current version in the Skia tree.

This breaks the Android build when the installed 'gyp' module doesn't
support the "make-android" generator.
Review URL: https://codereview.appspot.com/6344096

git-svn-id: http://skia.googlecode.com/svn/trunk@4832 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
digit@google.com 2012-07-30 16:48:13 +00:00
parent 2362ec808b
commit 48af8a0a6a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gyp_skia
View File

@ -26,7 +26,9 @@ gyp_config_dir = os.path.join(script_dir, 'gyp')
# to be written.
output_dir = os.path.join(os.path.abspath(script_dir), 'out')
sys.path.append(os.path.join(gyp_source_dir, 'pylib'))
# Ensure we import our current gyp source's module, not any version
# pre-installed in your PYTHONPATH.
sys.path.insert(0, os.path.join(gyp_source_dir, 'pylib'))
import gyp
def additional_include_files(args=[]):