Changeset 87927 in webkit


Ignore:
Timestamp:
Jun 2, 2011 10:40:53 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-02 Aaron Colwell <acolwell@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:
Location:
trunk/Source/WebKit/chromium
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r87926 r87927  
     12011-06-02  Aaron Colwell  <acolwell@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Bring gyp_webkit up to date with changes made to
     6        gyp_chromium so chromium_rev can be advanced past
     7        revision 87140.
     8        https://bugs.webkit.org/show_bug.cgi?id=61881
     9
     10        * gyp_webkit:
     11
    1122011-05-21  Dimitri Glazkov  <dglazkov@chromium.org>
    213
  • trunk/Source/WebKit/chromium/gyp_webkit

    r76527 r87927  
    3737
    3838script_dir = os.path.dirname(__file__)
     39chrome_src = os.path.abspath(script_dir)
    3940
    40 sys.path.append(os.path.join(script_dir, 'tools', 'gyp', 'pylib'))
     41sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
    4142import gyp
     43
     44# Add tools/grit so that pymod_do_main(grit_info ...) can find grit_info.py.
     45sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
    4246
    4347def additional_include_files(args=[]):
Note: See TracChangeset for help on using the changeset viewer.