Commit a9274264 authored by Chris Davis's avatar Chris Davis Committed by Commit Bot

Setup etw registration in chrome.dll

Update ETW manifest usage so chrome.dll can be used to register the ETW
provider. Prior to this a DummyChrome.dll was needed which registered
the ETW provider used by Chrome. The chrome_events_win.man file was
updated to be a general application manifest containing a
instrumentation section.  The chrome_events_winTEMP.BIN and
MSG00001.bin files are auto-generated by the manifest compiler.

chrome.dll size (release x64)
Before: 122,627,584
After:  122,629,120
Total Increase: 1536 bytes

BUG: 1024949

Change-Id: Ibb3783da20a35a5caeabab93bd2da10a2cf67faa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896040Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Commit-Queue: Chris Davis <chrdavis@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#716375}
parent 2168b708
<?xml version='1.0' encoding='utf-8' standalone='yes'?> <?xml version='1.0' encoding='utf-8' standalone='yes'?>
<instrumentationManifest <assembly
xmlns="http://schemas.microsoft.com/win/2004/08/events" xmlns="urn:schemas-microsoft-com:asm.v3"
xmlns:win="http://manifests.microsoft.com/win/2004/08/windows/events" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://schemas.microsoft.com/win/2004/08/events eventman.xsd" manifestVersion="1.0"
> >
<instrumentation> <assemblyIdentity
<events> buildType="$(build.buildType)"
language="neutral"
name="Chrome.ETW"
processorArchitecture="$(build.arch)"
publicKeyToken="$(Build.WindowsPublicKeyToken)"
version="$(build.version)"
versionScope="nonSxS"
/>
<instrumentation
xmlns:win="http://manifests.microsoft.com/win/2004/08/windows/events"
buildFilter="not build.isWow"
>
<events xmlns="http://schemas.microsoft.com/win/2004/08/events">
<provider <provider
guid="{D2D578D9-2936-45B6-A09f-30E32715F42D}" guid="{D2D578D9-2936-45B6-A09f-30E32715F42D}"
messageFileName="chrome.dll" messageFileName="chrome.dll"
...@@ -71,7 +82,7 @@ ...@@ -71,7 +82,7 @@
</provider> </provider>
</events> </events>
</instrumentation> </instrumentation>
<localization xmlns="http://schemas.microsoft.com/win/2004/08/events"> <localization>
<resources culture="en-US"> <resources culture="en-US">
<stringTable> <stringTable>
<string <string
...@@ -81,4 +92,4 @@ ...@@ -81,4 +92,4 @@
</stringTable> </stringTable>
</resources> </resources>
</localization> </localization>
</instrumentationManifest> </assembly>
...@@ -48,7 +48,11 @@ source_set("chrome_dll_resources") { ...@@ -48,7 +48,11 @@ source_set("chrome_dll_resources") {
] ]
if (is_win) { if (is_win) {
sources += [ "chrome_dll.rc" ] sources += [
"chrome_dll.rc",
"etw_events/chrome_events_win.rc",
]
deps += [ deps += [
"//build:branding_buildflags", "//build:branding_buildflags",
"//printing/buildflags", "//printing/buildflags",
......
This diff was suppressed by a .gitattributes entry.
LANGUAGE 0x9,0x1
1 11 "MSG00001.bin"
1 WEVT_TEMPLATE "chrome_events_winTEMP.BIN"
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