Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1000)

Unified Diff: base/trace_event/BUILD.gn

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/trace_event/BUILD.gn
diff --git a/base/trace_event/BUILD.gn b/base/trace_event/BUILD.gn
index 479a918484322712ffaef6d261584225418a7c93..4f3819d479beb9494452b4fcef3cd4fe6958afdf 100644
--- a/base/trace_event/BUILD.gn
+++ b/base/trace_event/BUILD.gn
@@ -4,13 +4,19 @@
source_set("trace_event") {
sources = [
- "memory_allocator_attributes.h",
+ "java_heap_dump_provider_android.cc",
+ "java_heap_dump_provider_android.h",
+ "memory_allocator_attributes_type_info.cc",
+ "memory_allocator_attributes_type_info.h",
"memory_allocator_dump.cc",
"memory_allocator_dump.h",
"memory_dump_manager.cc",
"memory_dump_manager.h",
"memory_dump_provider.cc",
"memory_dump_provider.h",
+ "memory_dump_request_args.h",
+ "memory_dump_session_state.cc",
+ "memory_dump_session_state.h",
"process_memory_dump.cc",
"process_memory_dump.h",
"process_memory_maps.cc",
@@ -25,6 +31,8 @@ source_set("trace_event") {
"trace_event_android.cc",
"trace_event_argument.cc",
"trace_event_argument.h",
+ "trace_event_etw_export_win.cc",
+ "trace_event_etw_export_win.h",
"trace_event_impl.cc",
"trace_event_impl.h",
"trace_event_impl_constants.cc",
@@ -36,6 +44,8 @@ source_set("trace_event") {
"trace_event_system_stats_monitor.h",
"trace_event_win.cc",
"trace_event_win.h",
+ "winheap_dump_provider_win.cc",
+ "winheap_dump_provider_win.h",
]
if (is_nacl) {
@@ -45,6 +55,13 @@ source_set("trace_event") {
]
}
+ if (is_linux || is_android) {
+ sources += [
+ "malloc_dump_provider.cc",
+ "malloc_dump_provider.h",
+ ]
+ }
+
configs += [ "//base:base_implementation" ]
deps = [
@@ -55,6 +72,10 @@ source_set("trace_event") {
"//base/third_party/dynamic_annotations",
]
+ if (is_win) {
+ deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ]
+ }
+
allow_circular_includes_from = [
"//base/debug",
"//base/memory",
@@ -67,6 +88,7 @@ source_set("trace_event") {
source_set("trace_event_unittests") {
testonly = true
sources = [
+ "memory_allocator_attributes_type_info_unittest.cc",
"memory_allocator_dump_unittest.cc",
"memory_dump_manager_unittest.cc",
"process_memory_maps_dump_provider_unittest.cc",
@@ -77,6 +99,7 @@ source_set("trace_event_unittests") {
"trace_event_system_stats_monitor_unittest.cc",
"trace_event_unittest.cc",
"trace_event_win_unittest.cc",
+ "winheap_dump_provider_win_unittest.cc",
]
deps = [
« no previous file with comments | « base/time/time.cc ('k') | base/trace_event/OWNERS » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698