Commit 4395170e by Jamie Madill Committed by Commit Bot

Roll chromium_revision fa9d5805c4..b0410bba02 (750702:763000)

Includes a change from yasm to nasm. Change log: https://chromium.googlesource.com/chromium/src/+log/fa9d5805c4..b0410bba02 Full diff: https://chromium.googlesource.com/chromium/src/+/fa9d5805c4..b0410bba02 Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/a1cbf6469a..45ab3c89af * buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/4164a30562..204a35a2a6 * testing: https://chromium.googlesource.com/chromium/src/testing/+log/3e21eec53c..3993ef1f52 * third_party/googletest: https://chromium.googlesource.com/chromium/src/third_party/googletest/+log/c96dc32110..217407c478 * third_party/jsoncpp: https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/+log/493c9385c9..ec647b85b6 * third_party/libjpeg_turbo: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git/+log/ce0e57e8e6..7e3ad79800 * third_party/zlib: https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/156be8c52f..ae385786ed * tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/d60a6a8084..04b99e7bf9 * tools/md_browser: https://chromium.googlesource.com/chromium/src/tools/md_browser/+log/0bfd826f85..aae45d8d82 DEPS diff: https://chromium.googlesource.com/chromium/src/+/fa9d5805c4..b0410bba02/DEPS Clang version changed 9284abd0040afecfd619dbcf1b244a8b533291c9:4e0d9925d6a3561449bdd8def27fd3f3f1b3fb9f Details: https://chromium.googlesource.com/chromium/src/+/fa9d5805c4..b0410bba02/tools/clang/scripts/update.py Tbr: jmadill@chromium.org Bug: chromium:1070043 Change-Id: I8f2cd61950b1a94b946eace49a7f1da3447522ff Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2168533 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 4262ea04
...@@ -19,7 +19,7 @@ vars = { ...@@ -19,7 +19,7 @@ vars = {
'checkout_angle_internal': False, 'checkout_angle_internal': False,
# Version of Chromium our Chromium-based DEPS are mirrored from. # Version of Chromium our Chromium-based DEPS are mirrored from.
'chromium_revision': 'fa9d5805c421133e9d13cf698c4502d13398b2ce', 'chromium_revision': 'b0410bba028cf153be2d02e36b6e99b59fdcb000',
# Current revision of VK-GL-CTS (a.k.a dEQP). # Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': 'a6b249819f7177821d4b7eefff36af07fef71825', 'vk_gl_cts_revision': 'a6b249819f7177821d4b7eefff36af07fef71825',
...@@ -69,17 +69,17 @@ vars = { ...@@ -69,17 +69,17 @@ vars = {
deps = { deps = {
'build': { 'build': {
'url': '{chromium_git}/chromium/src/build.git@a1cbf6469a5400f2b455ffba2e95ea47a1b47c94', 'url': '{chromium_git}/chromium/src/build.git@45ab3c89af6fc3126b0ca5a7836f0db85ad1ba0e',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'buildtools': { 'buildtools': {
'url': '{chromium_git}/chromium/src/buildtools.git@4164a305626786b1912d467003acf4c4995bec7d', 'url': '{chromium_git}/chromium/src/buildtools.git@204a35a2a64f7179f8b76d7a0385653690839e21',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'testing': { 'testing': {
'url': '{chromium_git}/chromium/src/testing@3e21eec53c1688302ebc26e975d0163256bd1a15', 'url': '{chromium_git}/chromium/src/testing@3993ef1f527b206d8d3bf3f9824f4fe0e4bbdb0e',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
...@@ -119,13 +119,13 @@ deps = { ...@@ -119,13 +119,13 @@ deps = {
}, },
'third_party/googletest': { 'third_party/googletest': {
'url': '{chromium_git}/chromium/src/third_party/googletest@c96dc321101e7c9f5ba16d957afd49ee4db30548', 'url': '{chromium_git}/chromium/src/third_party/googletest@217407c4787f361aa5814ec609379bfc9b21d307',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
# libjpeg_turbo is used by glmark2. # libjpeg_turbo is used by glmark2.
'third_party/libjpeg_turbo': { 'third_party/libjpeg_turbo': {
'url': '{chromium_git}/chromium/deps/libjpeg_turbo.git@ce0e57e8e636f5132fe6f0590a4dba91f92fd935', 'url': '{chromium_git}/chromium/deps/libjpeg_turbo.git@7e3ad79800a7945fb37173149842b494ab8982b2',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
...@@ -135,10 +135,15 @@ deps = { ...@@ -135,10 +135,15 @@ deps = {
}, },
'third_party/jsoncpp': { 'third_party/jsoncpp': {
'url': '{chromium_git}/chromium/src/third_party/jsoncpp@493c9385c91023c3819b51ee0de552d52229a1e5', 'url': '{chromium_git}/chromium/src/third_party/jsoncpp@ec647b85b61f525a1a74e4da7477b0c5371c50f4',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'third_party/nasm': {
'url': '{chromium_git}/chromium/deps/nasm@4fa54ca5f7fc3a15a8c78ac94688e64d3e4e4fa1',
'condition': 'not build_with_chromium',
},
'third_party/Python-Markdown': { 'third_party/Python-Markdown': {
'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@36657c103ce5964733bbbb29377085e9cc1a9472', 'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@36657c103ce5964733bbbb29377085e9cc1a9472',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
...@@ -206,18 +211,13 @@ deps = { ...@@ -206,18 +211,13 @@ deps = {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}', 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}',
}, },
'third_party/yasm': {
'url': '{chromium_git}/chromium/src/third_party/yasm@8e4e548d0b199df58740336024c1b3baf7c0abd7',
'condition': 'not build_with_chromium',
},
'third_party/zlib': { 'third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@156be8c52f80cde343088b4a69a80579101b6e67', 'url': '{chromium_git}/chromium/src/third_party/zlib@ae385786edb15f57e992c5e9dd9464e376d69399',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'tools/clang': { 'tools/clang': {
'url': '{chromium_git}/chromium/src/tools/clang.git@d60a6a8084300eb8de99e56b559369dcde4cffa4', 'url': '{chromium_git}/chromium/src/tools/clang.git@04b99e7bf9160d551c3a5562f583014b6afc90f9',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
...@@ -233,7 +233,7 @@ deps = { ...@@ -233,7 +233,7 @@ deps = {
}, },
'tools/md_browser': { 'tools/md_browser': {
'url': '{chromium_git}/chromium/src/tools/md_browser@0bfd826f8566a99923e64a782908faca72bc457c', 'url': '{chromium_git}/chromium/src/tools/md_browser@aae45d8d82400e90483d4fee2ca3e648f2313cb2',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
...@@ -436,5 +436,4 @@ recursedeps = [ ...@@ -436,5 +436,4 @@ recursedeps = [
'buildtools', 'buildtools',
'third_party/googletest', 'third_party/googletest',
'third_party/jsoncpp', 'third_party/jsoncpp',
'third_party/yasm',
] ]
...@@ -37,10 +37,10 @@ ANGLE_CHROMIUM_DEPS = [ ...@@ -37,10 +37,10 @@ ANGLE_CHROMIUM_DEPS = [
'third_party/googletest', 'third_party/googletest',
'third_party/libjpeg_turbo', 'third_party/libjpeg_turbo',
'third_party/jsoncpp', 'third_party/jsoncpp',
'third_party/nasm',
'third_party/Python-Markdown', 'third_party/Python-Markdown',
'third_party/qemu-linux-x64', 'third_party/qemu-linux-x64',
'third_party/qemu-mac-x64', 'third_party/qemu-mac-x64',
'third_party/yasm',
'third_party/zlib', 'third_party/zlib',
'tools/clang', 'tools/clang',
'tools/md_browser', 'tools/md_browser',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment