0

Use external devtools frontend for scripts and docs

This adds external devtools frontend as DEPS, but does not
start using it except for scripts and documentation. Build
and tests are not affected.

Bug: 1011259
Change-Id: I3b6173582bf88974784f6d758ad91b6f740b1b26
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855740
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707730}
This commit is contained in:
Yang Guo
2019-10-21 07:14:37 +00:00
committed by Commit Bot
parent 5514046a3d
commit 210ffc9e9c
9 changed files with 14 additions and 7 deletions
DEPS
chrome/browser
docs
third_party
tools/gritsettings

7
DEPS

@ -240,6 +240,10 @@ vars = {
# and whatever else without interference from each other.
'devtools_node_modules_revision': '207c67362bdb7e135dc5735fb46b9c508d4e4c5e',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling devtools-frontend
# and whatever else without interference from each other.
'devtools_frontend_revision': '4fd355cc40e2392987a17339663fa86d3c472a8d',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libprotobuf-mutator
# and whatever else without interference from each other.
'libprotobuf-mutator': '439e81f8f4847ec6e2bf11b3aa634a5d8485633d',
@ -892,6 +896,9 @@ deps = {
'src/third_party/devtools-node-modules':
Var('chromium_git') + '/external/github.com/ChromeDevTools/devtools-node-modules' + '@' + Var('devtools_node_modules_revision'),
'src/third_party/devtools-frontend/src':
Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
'src/third_party/dom_distiller_js/dist':
Var('chromium_git') + '/chromium/dom-distiller/dist.git' + '@' + '3093c3e238768ab27ff756bd7563ccbb12129d9f',

@ -1186,7 +1186,7 @@
},
{
"name": "enable-devtools-experiments",
"owners": [ "//third_party/blink/renderer/devtools/OWNERS" ],
"owners": [ "//third_party/devtools-frontend/src/OWNERS" ],
// This is a catch-all for ongoing devtools experiments.
"expiry_milestone": -1
},

@ -16,7 +16,7 @@ jsbundler_modules = rebase_path([
".",
"$closure_library_dir/../bin/build")
jsbundler_modules +=
[ "//third_party/blink/renderer/devtools/scripts/build/rjsmin.py" ]
[ "//third_party/devtools-frontend/src/scripts/build/rjsmin.py" ]
template("run_jsbundler") {
assert(defined(invoker.mode))

@ -41,7 +41,7 @@ _SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
_CHROME_SOURCE = os.path.realpath(
os.path.join(_SCRIPT_DIR, *[os.path.pardir] * 6))
sys.path.insert(0, os.path.join(
_CHROME_SOURCE, 'third_party/blink/renderer/devtools/scripts/build'))
_CHROME_SOURCE, 'third_party/devtools-frontend/src/scripts/build'))
sys.path.insert(0, os.path.join(
_CHROME_SOURCE, ('third_party/chromevox/third_party/' +
'closure-library/closure/bin/build')))

@ -80,8 +80,6 @@ display log messages to the `LogCat` pane.
<classpathentry kind="src" path="remoting/android/java/src"/>
<classpathentry kind="src" path="remoting/android/apk/src"/>
<classpathentry kind="src" path="remoting/android/javatests/src"/>
<classpathentry kind="src" path="third_party/blink/renderer/devtools/scripts/jsdoc-validator/src"/>
<classpathentry kind="src" path="third_party/blink/renderer/devtools/scripts/compiler-runner/src"/>
<classpathentry kind="src" path="third_party/webrtc/voice_engine/test/android/android_test/src"/>
<classpathentry kind="src" path="third_party/webrtc/modules/video_capture/android/java/src"/>
<classpathentry kind="src" path="third_party/webrtc/modules/video_render/android/java/src"/>

@ -5,7 +5,7 @@ currently supported on Linux, Windows, Mac, and ChromeOS.
* [Old Ash Doc](https://www.chromium.org/developers/how-tos/inspecting-ash)
* [Backend Source Code](https://cs.chromium.org/chromium/src/components/ui_devtools/)
* [Inspector Frontend Source Code](https://cs.chromium.org/chromium/src/third_party/blink/renderer/devtools/front_end/)
* [Inspector Frontend Source Code](https://chromium.googlesource.com/devtools/devtools-frontend)
## How to run

@ -66,6 +66,7 @@
/dav1d/libdav1d
/dawn
/depot_tools
/devtools-frontend/src
/devtools-node-modules
/directxsdk
/dom_distiller_js/dist

@ -577,7 +577,7 @@ source_set("blink_headers") {
}
if (external_devtools_frontend) {
devtools_frontend_path = "//third_party/devtools-frontend"
devtools_frontend_path = "//third_party/devtools-frontend/src"
} else {
devtools_frontend_path = "//third_party/blink/renderer/devtools"
}

@ -96,6 +96,7 @@
"components/components_locale_settings.grd": "Not UI strings; localized separately",
"components/omnibox/resources/omnibox_resources.grd": "Not UI strings; localized separately",
"third_party/blink/renderer/devtools/front_end/langpacks/devtools_ui_strings.grd" : "Devtools UI strings that are optionally enabled by browser.",
"third_party/devtools-frontend/src/front_end/langpacks/devtools_ui_strings.grd" : "Devtools UI strings that are optionally enabled by browser.",
"tools/grit/grit/testdata/buildinfo.grd": "Test data",
"tools/grit/grit/testdata/chrome/app/generated_resources.grd": "Test data",
"tools/grit/grit/testdata/substitute.grd": "Test data",