# Edit these when rolling DEPS.xwalk.
# -----------------------------------
-chromium_crosswalk_rev = 'f8b103e7c4f60e2cf88f49594dbcdd06e58ffa17'
-blink_crosswalk_rev = '99b0aa2fd873af570eb84cbbd342a343ce8bfd7f'
-v8_crosswalk_rev = '535cd006e5174ff00fd7b745a581980b1d371a9f'
-ozone_wayland_rev = '5047b6ea8843bfd439a9f5adf2e270cd6fa6db7c'
+chromium_crosswalk_rev = 'ea46c0b6279a60b0173a092f0e9f0403a2a047a9'
+v8_crosswalk_rev = '05d1cf41ef1b6e73079f69492d9e942ec19cc61a'
+ozone_wayland_rev = '6379cd118da098b55a5934ce1a90b377a177ed40'
+
+# |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 = '1620ccec09abbd0dae196999fbcd94505136b306'
+blink_upstream_rev = '185156'
crosswalk_git = 'https://github.com/crosswalk-project'
ozone_wayland_git = 'https://github.com/01org'
# You do not need to worry about these most of the time.
# ------------------------------------------------------
-chromium_solution = {
- '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,
- }
-}
+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,
-# 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.
-ignored_directories = [
- 'build',
- 'build/scripts/command_wrapper/bin',
- 'build/scripts/gsd_generate_index',
- 'build/scripts/private/data/reliability',
- 'build/scripts/tools/deps2git',
- 'build/third_party/cbuildbot_chromite',
- 'build/third_party/gsutil',
- 'build/third_party/lighttpd',
- 'build/third_party/swarm_client',
- 'build/third_party/xvfb',
- 'build/xvfb',
- 'commit-queue',
- 'depot_tools',
-]
-for ignored_directory in ignored_directories:
- chromium_solution['custom_deps'][ignored_directory] = None
+ # 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',
-# 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.
-ozone_wayland_solution = {
- 'name': 'src/ozone',
- 'url': ozone_wayland_git + '/ozone-wayland.git@' + ozone_wayland_rev,
- 'deps_file': '',
-}
+ # 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,
+ },
-solutions = [chromium_solution,
- ozone_wayland_solution]
+ '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.