Use devtools.gni for devtools_location

The Chromium build configuration now defines where DevTools lives. This requires https://crrev.com/c/3043613 to roll into /build first. [email protected] Fixed: 1231495 Change-Id: I2b6721a9541d191492429e9a0027523f7c9bd013 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3043614 Commit-Queue: Tim van der Lippe <[email protected]> Reviewed-by: Alex Rudenko <[email protected]>
CoherentLabs · Jul 22, 2021 · 2b21feb · 2b21feb
1 parent a41f27f
commit 2b21feb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/build_overrides/BUILDCONFIG.gn b/build_overrides/BUILDCONFIG.gn
@@ -40,11 +40,6 @@ declare_args() {
   # every toolchain can pass through the "global" value via toolchain_args().
   host_toolchain = ""
 
-  # Needed to properly resolve the locations for the TypeScript build system
-  # when we are building for DevTools only. This arg will not be defined in
-  # Chromium itself.
-  use_devtools_typescript = true
-
   # DON'T ADD MORE FLAGS HERE. Read the comment above.
 }
 

diff --git a/scripts/build/ninja/vars.gni b/scripts/build/ninja/vars.gni
@@ -2,14 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/devtools.gni")
+
 declare_args() {
   devtools_dcheck_always_on = is_debug
-
-  if (defined(use_devtools_typescript) && use_devtools_typescript) {
-    devtools_location = ""
-  } else {
-    devtools_location = "third_party/devtools-frontend/src/"
-  }
 }
 
 # Introduce a new variable to make sure that string