diff options
| -rwxr-xr-x | gyp/gyp_skia | 2 | ||||
| -rwxr-xr-x | gyp_skia | 2 | ||||
| -rw-r--r-- | third_party/externals/README | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/gyp/gyp_skia b/gyp/gyp_skia index 58fab82571..b71757b70b 100755 --- a/gyp/gyp_skia +++ b/gyp/gyp_skia @@ -40,7 +40,7 @@ script_dir = os.path.dirname(__file__) gyp_dir = os.path.normpath(os.path.join(script_dir, os.pardir, 'third_party')) -sys.path.append(os.path.join(gyp_dir, 'externals', 'gyp', 'pylib')) +sys.path.append(os.path.join(gyp_dir, 'gyp', 'pylib')) import gyp def additional_include_files(args=[]): @@ -26,7 +26,7 @@ import sys script_dir = os.path.dirname(__file__) # Directory within which we can find the gyp source. -gyp_source_dir = os.path.join(script_dir, 'third_party', 'externals', 'gyp') +gyp_source_dir = os.path.join(script_dir, 'third_party', 'gyp') # Directory within which we can find most of Skia's gyp configuration files. gyp_config_dir = os.path.join(script_dir, 'gyp') diff --git a/third_party/externals/README b/third_party/externals/README index ca809c41a1..344ee29bff 100644 --- a/third_party/externals/README +++ b/third_party/externals/README @@ -9,3 +9,14 @@ svn propedit svn:externals . See http://svnbook.red-bean.com/en/1.5/svn.advanced.externals.html for more info. + + +NOTE: We have disabled our use of these external dependencies, for now, because +they will fail for anyone using gclient to check out the skia code. (As of +early 2011, gclient passes --ignore-externals when calling svn update.) See +http://code.google.com/p/skia/issues/detail?id=291 and +https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/1f99541c2c5f6c6e + +Leaving this directory (and unused external dependency on gyp) in place until +we figure out the long-term solution. We may start using it again, or replace with +DEPS, or ??? |