Upstream version 11.40.271.0

[platform/framework/web/crosswalk.git] / src / xwalk / DEPS.xwalk

diff --git a/src/xwalk/DEPS.xwalk b/src/xwalk/DEPS.xwalk
index c279ba4..13aabd8 100644 (file)
--- a/src/xwalk/DEPS.xwalk
+++ b/src/xwalk/DEPS.xwalk
@@ -17,10 +17,18 @@
 # Edit these when rolling DEPS.xwalk.
 # -----------------------------------
 
-chromium_crosswalk_rev = 'e5698a22dd1587355fd53fa7142be15776985608'
-blink_crosswalk_rev = '92e5d6adee53362b3f5aaec11bcb0526d5f0715d'
-v8_crosswalk_rev = '0bb343f5ed1becef0996a234d5d7d431e60ef72a'
-ozone_wayland_rev = 'db2f41907a6c63f8c1dfc100f4db4ce5b2259a76'
+chromium_crosswalk_rev = 'e36755cc26d8a8fcb4f4c3cca52c242297326917'
+v8_crosswalk_rev = '11bb7b400ff9e0179ecf6fe358b9d9452d297234'
+ozone_wayland_rev = '597c8dfffd6058589db481c9d3beb1120eaf2b6b'
+
+# |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 = 'ef7455cd2a78bb7f85f5d8356047daf658b1ce5a'
+blink_upstream_rev = '185310'
 
 crosswalk_git = 'https://github.com/crosswalk-project'
 ozone_wayland_git = 'https://github.com/01org'
@@ -42,13 +50,10 @@ solutions = [
       'src/v8':
         crosswalk_git + '/v8-crosswalk.git@' + v8_crosswalk_rev,
 
-      # Temporarily switch to a more recent WebRTC version that includes its
-      # r6909, which, together with r6853, fixes the problems described in
-      # XWALK-2160.
-      # See also: https://code.google.com/p/webrtc/issues/detail?id=3625
-      'src/third_party/webrtc':
-        'https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git@'
-           'cdc312345fcdfc586a7c8cd720407449cc0bdcd2',
+      # 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
@@ -67,6 +72,15 @@ solutions = [
       '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
@@ -79,6 +93,21 @@ solutions = [
   }
 ]
 
+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.
 # -------------------------------------------------