Commit 5e0a669f authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

[DevTools] Use the encoding library in third_party/inspector_protocol directly.

This makes it so that inspector_protocol instantiations within
Chromium stop using the copy of the encoding library in the template -
that is, third_party/inspector_protocol/lib/encoding_{h,cpp}.template -
and use the C++ library directly instead. This is done
by having third_party/inspector_protocol/lib/Values_cpp.template
include it, which is configured in the
inspector_protocol_config.json.

Change-Id: Ia38fa2b36585ae90d2889946cae346e168dc5f59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1634423
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664856}
parent 71c2a39c
......@@ -198,7 +198,8 @@ static_library("devtools") {
sources += [ "devtools_dock_tile.cc" ]
}
if (!is_android) {
deps += [ ":protocol_generated_sources" ]
deps += [ ":protocol_generated_sources",
"//third_party/inspector_protocol:encoding" ]
sources += [
"protocol/browser_handler.cc",
"protocol/browser_handler.h",
......
......@@ -35,5 +35,10 @@
"package": "chrome/browser/devtools/protocol",
"output": "protocol",
"string_header": "chrome/browser/devtools/protocol/base_string_adapter.h"
},
"encoding_lib": {
"header": "third_party/inspector_protocol/encoding/encoding.h",
"namespace": ["inspector_protocol_encoding"]
}
}
......@@ -92,6 +92,7 @@ component("ui_devtools") {
"//base",
"//net",
"//ui/gfx",
"//third_party/inspector_protocol:encoding",
]
public_deps = [
......
......@@ -13,5 +13,10 @@
"string_header": "components/ui_devtools/base_string_adapter.h",
"export_macro": "UI_DEVTOOLS_EXPORT",
"export_header": "components/ui_devtools/devtools_export.h"
},
"encoding_lib": {
"header": "third_party/inspector_protocol/encoding/encoding.h",
"namespace": ["inspector_protocol_encoding"]
}
}
......@@ -113,5 +113,10 @@
"string_header": "content/browser/devtools/protocol/base_string_adapter.h",
"export_macro": "CONTENT_EXPORT",
"export_header": "content/common/content_export.h"
},
"encoding_lib": {
"header": "third_party/inspector_protocol/encoding/encoding.h",
"namespace": ["inspector_protocol_encoding"]
}
}
......@@ -303,6 +303,7 @@ jumbo_source_set("headless_shared_sources") {
"//base:base_static",
"//content/public/common",
"//content/public/common:service_names",
"//third_party/inspector_protocol:encoding",
"//ui/base",
"//url",
]
......
......@@ -39,5 +39,10 @@
"string_header": "headless/lib/browser/protocol/base_string_adapter.h",
"export_macro": "HEADLESS_EXPORT",
"export_header": "headless/public/headless_export.h"
},
"encoding_lib": {
"header": "third_party/inspector_protocol/encoding/encoding.h",
"namespace": ["inspector_protocol_encoding"]
}
}
......@@ -124,5 +124,10 @@
"string_header": "third_party/blink/renderer/core/inspector/v8_inspector_string.h",
"export_macro": "CORE_EXPORT",
"export_header": "third_party/blink/renderer/core/core_export.h"
},
"encoding_lib": {
"header": "third_party/inspector_protocol/encoding/encoding.h",
"namespace": ["inspector_protocol_encoding"]
}
}
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