Title: [87927] trunk/Source/WebKit/chromium
- Revision
- 87927
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-02 10:40:53 -0700 (Thu, 02 Jun 2011)
Log Message
2011-06-02 Aaron Colwell <acolw...@chromium.org>
Reviewed by Dimitri Glazkov.
Bring gyp_webkit up to date with changes made to
gyp_chromium so chromium_rev can be advanced past
revision 87140.
https://bugs.webkit.org/show_bug.cgi?id=61881
* gyp_webkit:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (87926 => 87927)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-02 17:30:49 UTC (rev 87926)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-02 17:40:53 UTC (rev 87927)
@@ -1,3 +1,14 @@
+2011-06-02 Aaron Colwell <acolw...@chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Bring gyp_webkit up to date with changes made to
+ gyp_chromium so chromium_rev can be advanced past
+ revision 87140.
+ https://bugs.webkit.org/show_bug.cgi?id=61881
+
+ * gyp_webkit:
+
2011-05-21 Dimitri Glazkov <dglaz...@chromium.org>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit/chromium/gyp_webkit (87926 => 87927)
--- trunk/Source/WebKit/chromium/gyp_webkit 2011-06-02 17:30:49 UTC (rev 87926)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2011-06-02 17:40:53 UTC (rev 87927)
@@ -36,10 +36,14 @@
import sys
script_dir = os.path.dirname(__file__)
+chrome_src = os.path.abspath(script_dir)
-sys.path.append(os.path.join(script_dir, 'tools', 'gyp', 'pylib'))
+sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
import gyp
+# Add tools/grit so that pymod_do_main(grit_info ...) can find grit_info.py.
+sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
+
def additional_include_files(args=[]):
"""
Returns a list of additional (.gypi) files to include, without
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
