[go: nahoru, domu]

Reland "DEPS: use build_with_chromium more widely"

This reverts commit ba6620d58b859c0e5ad2db0d4b3415ad2199c6b0.

Reason for revert:
fix condition in 'lastchange' hook.

Original change's description:
> Revert "DEPS: use build_with_chromium more widely"
>
> This reverts commit 18c82b538607e7fda6cff55b27e07497174ff820.
>
> Reason for revert: speculative revert due to failing src-internal rolls https://chrome-internal-review.googlesource.com/c/chrome/src-internal/+/4472596 (this CL is the only one included in the first failing roll)
>
> Original change's description:
> > DEPS: use build_with_chromium more widely
> >
> > This is preparation CL for https://crrev.com/c/3393303
> >
> > Bug: 1278663
> > Change-Id: Ie186b3642e7ffc02ace2f87008fff77092b9a81d
> > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3393225
> > Reviewed-by: Tim Van der Lippe <tvanderlippe@chromium.org>
> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> > Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
>
> Bug: 1278663
> Change-Id: Id3f840295305a1b4238d45ff468882a339dce94b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3399828
> Auto-Submit: Alex Rudenko <alexrudenko@chromium.org>
> Reviewed-by: Liviu Rau <liviurau@chromium.org>
> Commit-Queue: Liviu Rau <liviurau@chromium.org>

Bug: 1278663
Fixed: 1288746
Change-Id: I24be7c9237f7e21c6cfdc1c307bb881178df144f
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3398097
Reviewed-by: Alex Rudenko <alexrudenko@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Tim Van der Lippe <tvanderlippe@chromium.org>
Commit-Queue: Tim Van der Lippe <tvanderlippe@chromium.org>
diff --git a/DEPS b/DEPS
index 9bb7953..10793de 100644
--- a/DEPS
+++ b/DEPS
@@ -47,11 +47,15 @@
 allowed_hosts = [ 'chromium.googlesource.com' ]
 
 deps = {
-  'buildtools/clang_format/script':
-    Var('clang_format_url') + '@' + Var('clang_format_revision'),
+  'buildtools/clang_format/script': {
+    'url': Var('clang_format_url') + '@' + Var('clang_format_revision'),
+    'condition': 'build_with_chromium == False',
+  },
 
-  'buildtools':
-    Var('buildtools_url') + '@' + Var('buildtools_revision'),
+  'buildtools': {
+    'url': Var('buildtools_url') + '@' + Var('buildtools_revision'),
+    'condition': 'build_with_chromium == False',
+  },
 
   'buildtools/linux64': {
     'packages': [
@@ -61,7 +65,7 @@
       }
     ],
     'dep_type': 'cipd',
-    'condition': 'host_os == "linux"',
+    'condition': 'host_os == "linux" and build_with_chromium == False',
   },
   'buildtools/mac': {
     'packages': [
@@ -71,7 +75,7 @@
       }
     ],
     'dep_type': 'cipd',
-    'condition': 'host_os == "mac"',
+    'condition': 'host_os == "mac" and build_with_chromium == False',
   },
   'buildtools/win': {
     'packages': [
@@ -81,7 +85,7 @@
       }
     ],
     'dep_type': 'cipd',
-    'condition': 'host_os == "win"',
+    'condition': 'host_os == "win" and build_with_chromium == False',
   },
   'buildtools/reclient': {
     'packages': [
@@ -104,12 +108,18 @@
     'dep_type': 'cipd',
   },
 
-  'build':
-    Var('build_url') + '@' + Var('build_revision'),
-  'third_party/depot_tools':
-    Var('depot_tools_url') + '@' + Var('depot_tools_revision'),
-  'third_party/inspector_protocol':
-    Var('inspector_protocol_url') + '@' + Var('inspector_protocol_revision'),
+  'build': {
+    'url': Var('build_url') + '@' + Var('build_revision'),
+    'condition': 'build_with_chromium == False',
+  },
+  'third_party/depot_tools': {
+    'url': Var('depot_tools_url') + '@' + Var('depot_tools_revision'),
+    'condition': 'build_with_chromium == False',
+  },
+  'third_party/inspector_protocol': {
+    'url': Var('inspector_protocol_url') + '@' + Var('inspector_protocol_revision'),
+    'condition': 'build_with_chromium == False',
+  },
 }
 
 hooks = [
@@ -158,6 +168,7 @@
     # disabled.
     'name': 'disable_depot_tools_selfupdate',
     'pattern': '.',
+    'condition': 'build_with_chromium == False',
     'action': [
         'python3',
         'third_party/depot_tools/update_depot_tools_toggle.py',
@@ -243,6 +254,7 @@
   {
     # Update LASTCHANGE for build script timestamps
     'name': 'lastchange',
+    'condition': 'build_with_chromium == False',
     'pattern': '.',
     'action': ['python3', 'build/util/lastchange.py',
                '-o', 'build/util/LASTCHANGE'],
@@ -250,7 +262,7 @@
   {
     'name': 'sysroot_x64',
     'pattern': '.',
-    'condition': 'checkout_linux and checkout_x64',
+    'condition': 'checkout_linux and checkout_x64 and build_with_chromium == False',
     'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py',
                '--arch=x64'],
   },