-''' This file indicate the dependencies crosswalk lays on.
- DO NOT use this DEPS to checkout code, it's for tools/generate_gclient-xwalk.py.
-'''
-
-# chromium_version is the version of chromium crosswalk based,
-# Usually it's major.minor.build.patch
-# Use 'Trunk' for trunk.
-# If using trunk, will use '.DEPS.git' for gclient.
-chromium_version = '36.0.1985.18'
-chromium_crosswalk_point = 'c282374abcd161a82bbcd5a51e02e33b1be0b1c4'
-blink_crosswalk_point = '7425f4985931cbd48e669c205a707cf1ff4ff6c6'
-v8_crosswalk_point = '535cd006e5174ff00fd7b745a581980b1d371a9f'
-ozone_wayland_point = 'a5ca2e9203e6a0567751cc0400995982b703dde4'
-
-deps_xwalk = {
- 'src': 'https://github.com/crosswalk-project/chromium-crosswalk.git@%s' % chromium_crosswalk_point,
- 'src/third_party/WebKit': 'https://github.com/crosswalk-project/blink-crosswalk.git@%s' % blink_crosswalk_point,
- 'src/v8': 'https://github.com/crosswalk-project/v8-crosswalk.git@%s' % v8_crosswalk_point,
-
- # Ozone-Wayland is required for Wayland support in Chromium.
- 'src/ozone': 'https://github.com/01org/ozone-wayland.git@%s' % ozone_wayland_point,
-}
-vars_xwalk = {
-}
+# Source code dependencies required for building Crosswalk.
+#
+# This file is used as a template to generate .gclient-xwalk, which is a
+# regular .gclient file pointing to additional source code repositories that
+# need to be checked out in order to build Crosswalk.
+#
+# These dependencies are not specified in DEPS for historical compatibility
+# reasons and also to allow us to perform some additional manipulation on some
+# entries (such as setting a custom value for "deps_file" in certain
+# solutions).
+#
+# If you are doing a DEPS roll, you should only need to worry about the *_rev
+# variables below.
+
+# -----------------------------------
+# Crosswalk dependencies.
+# Edit these when rolling DEPS.xwalk.
+# -----------------------------------
+
+chromium_crosswalk_rev = '0bbff352135bacf2e6a17b5ffebd387f3c2d085f'
+v8_crosswalk_rev = '05d1cf41ef1b6e73079f69492d9e942ec19cc61a'
+ozone_wayland_rev = 'b002e0692f397a02264cc99208081f54a90d0973'
+
+# |blink_crosswalk_rev| specifies the SHA1 hash of the blink-crosswalk commit
+# we want to point to, very much like the variables above.
+# |blink_upstream_rev| indicates the revision of the latest upstream commit in
+# the blink-crosswalk repository, so that the devtools code can use it to fetch
+# assets from Chromium's servers with a revision that exists there. We need an
+# SVN revision while Blink is still in SVN.
+blink_crosswalk_rev = 'dc24b658e6b89accb1e21a14bc06dc72bfc00c41'
+blink_upstream_rev = '185310'
+
+crosswalk_git = 'https://github.com/crosswalk-project'
+ozone_wayland_git = 'https://github.com/01org'
+
+# ------------------------------------------------------
+# gclient solutions.
+# You do not need to worry about these most of the time.
+# ------------------------------------------------------
+
+solutions = [
+ { 'name': 'src',
+ 'url': crosswalk_git + '/chromium-crosswalk.git@' + chromium_crosswalk_rev,
+ 'deps_file': '.DEPS.git',
+ 'custom_deps': {
+ 'src':
+ crosswalk_git + '/chromium-crosswalk.git@' + chromium_crosswalk_rev,
+ 'src/third_party/WebKit':
+ crosswalk_git + '/blink-crosswalk.git@' + blink_crosswalk_rev,
+ 'src/v8':
+ crosswalk_git + '/v8-crosswalk.git@' + v8_crosswalk_rev,
+
+ # Include OpenCL header files for WebCL support, target version 1.2.
+ 'src/third_party/khronos/CL':
+ 'https://cvs.khronos.org/svn/repos/registry/trunk/public/cl/api/1.2@'
+ '28150',
+
+ # These directories are not relevant to Crosswalk and can be safely ignored
+ # in a checkout. It avoids creating additional directories outside src/ that
+ # are not used and also saves some bandwidth.
+ 'build': None,
+ 'build/scripts/command_wrapper/bin': None,
+ 'build/scripts/gsd_generate_index': None,
+ 'build/scripts/private/data/reliability': None,
+ 'build/scripts/tools/deps2git': None,
+ 'build/third_party/cbuildbot_chromite': None,
+ 'build/third_party/gsutil': None,
+ 'build/third_party/lighttpd': None,
+ 'build/third_party/swarm_client': None,
+ 'build/third_party/xvfb': None,
+ 'build/xvfb': None,
+ 'commit-queue': None,
+ 'depot_tools': None,
+ },
+
+ 'custom_hooks': [
+ # Disable Chromium's "gyp" hooks, which runs the gyp_chromium script. We
+ # are not interested in running it as we use gyp_xwalk instead (and it is
+ # run at a later stage as a hook in Crosswalk's own DEPS).
+ {
+ 'name': 'gyp',
+ },
+ ],
+ },
+
+ # ozone-wayland is set as a separate solution because we gclient _not_ to read
+ # its .DEPS.git: it changes the recursion limit and tries to check Chromium
+ # upstream out itself, leading to URL conflicts and errors about duplicate
+ # entries.
+ { 'name': 'src/ozone',
+ 'url': ozone_wayland_git + '/ozone-wayland.git@' + ozone_wayland_rev,
+ 'deps_file': '',
+ }
+]
+
+hooks = [
+ {
+ 'action': [
+ 'python',
+ 'src/xwalk/tools/upstream_revision.py',
+ '-r',
+ blink_upstream_rev,
+ '-o',
+ 'src/xwalk/build/UPSTREAM.blink'
+ ],
+ 'pattern': '.',
+ 'name': 'upstream_revision'
+ }
+]
+
+# -------------------------------------------------
+# This area is edited by generate_gclient-xwalk.py.
+# -------------------------------------------------
projects / platform / framework / web / crosswalk.git / blobdiff