diff options
author | brettw <brettw@chromium.org> | 2015-12-21 14:51:24 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-21 22:53:08 +0000 |
commit | c44e20582891a9c7e587f4143c490d99ea3eac73 (patch) | |
tree | 8426f6bdefd0d7515fde524a078f337b5e334dd8 /base/trace_event | |
parent | 558e6c4cffb00e10d7946cc93948df6e660f9bdb (diff) | |
download | chromium_src-c44e20582891a9c7e587f4143c490d99ea3eac73.zip chromium_src-c44e20582891a9c7e587f4143c490d99ea3eac73.tar.gz chromium_src-c44e20582891a9c7e587f4143c490d99ea3eac73.tar.bz2 |
Move base GN subprojects into base.
These were all subprojects to keep the build files closer to the source, as is GN style.
However, because there is no API separation, this was messy and required whitelisting circular header includes.
We need to make base a static library in a non-component build for code stripping purposes, and this change requires that the type of each of these subprojects be either a source set in a component build, or a static library in a static build. Not doing this conditional typing was the reason https://codereview.chromium.org/1528233002/ was reverted.
Because of these problems, it's better to just have base be a big target like it is in GYP. We can remove the weird whitelisting for the header checker, and not have to add conditional target types for every one for the static library issue.
This makes the debugging flags a public dep of base, and removes chrome/ui's dependency on it, just depending on base instead.
The output name of chrome_browser_ui was removed since the target is a source set and the name can collide.
TBR=dpranke@chromium.org
Review URL: https://codereview.chromium.org/1540953003
Cr-Commit-Position: refs/heads/master@{#366480}
Diffstat (limited to 'base/trace_event')
-rw-r--r-- | base/trace_event/BUILD.gn | 148 | ||||
-rw-r--r-- | base/trace_event/etw_manifest/BUILD.gn | 2 |
2 files changed, 1 insertions, 149 deletions
diff --git a/base/trace_event/BUILD.gn b/base/trace_event/BUILD.gn deleted file mode 100644 index 9a85be8..0000000 --- a/base/trace_event/BUILD.gn +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("trace_event") { - sources = [ - "common/trace_event_common.h", - "heap_profiler_allocation_context.cc", - "heap_profiler_allocation_context.h", - "heap_profiler_allocation_context_tracker.cc", - "heap_profiler_allocation_context_tracker.h", - "heap_profiler_allocation_register.cc", - "heap_profiler_allocation_register.h", - "heap_profiler_allocation_register_posix.cc", - "heap_profiler_allocation_register_win.cc", - "heap_profiler_heap_dump_writer.cc", - "heap_profiler_heap_dump_writer.h", - "heap_profiler_stack_frame_deduplicator.cc", - "heap_profiler_stack_frame_deduplicator.h", - "heap_profiler_type_name_deduplicator.cc", - "heap_profiler_type_name_deduplicator.h", - "java_heap_dump_provider_android.cc", - "java_heap_dump_provider_android.h", - "memory_allocator_dump.cc", - "memory_allocator_dump.h", - "memory_allocator_dump_guid.cc", - "memory_allocator_dump_guid.h", - "memory_dump_manager.cc", - "memory_dump_manager.h", - "memory_dump_provider.h", - "memory_dump_request_args.cc", - "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", - "process_memory_maps.h", - "process_memory_maps_dump_provider.h", - "process_memory_totals.cc", - "process_memory_totals.h", - "process_memory_totals_dump_provider.cc", - "process_memory_totals_dump_provider.h", - "trace_buffer.cc", - "trace_buffer.h", - "trace_config.cc", - "trace_config.h", - "trace_event.h", - "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_memory_overhead.cc", - "trace_event_memory_overhead.h", - "trace_event_synthetic_delay.cc", - "trace_event_synthetic_delay.h", - "trace_event_system_stats_monitor.cc", - "trace_event_system_stats_monitor.h", - "trace_log.cc", - "trace_log.h", - "trace_log_constants.cc", - "trace_sampling_thread.cc", - "trace_sampling_thread.h", - "tracing_agent.cc", - "tracing_agent.h", - "winheap_dump_provider_win.cc", - "winheap_dump_provider_win.h", - ] - - configs += [ "//base:base_implementation" ] - - deps = [ - "//base/debug", - "//base/json", - "//base/memory", - "//base/process", - "//base/third_party/dynamic_annotations", - ] - - if (is_nacl) { - sources -= [ - "process_memory_totals_dump_provider.cc", - "trace_event_system_stats_monitor.cc", - ] - } - - if (is_linux || is_android || is_mac) { - sources += [ - "malloc_dump_provider.cc", - "malloc_dump_provider.h", - ] - } - - if (is_linux || is_android) { - sources += [ "process_memory_maps_dump_provider.cc" ] - } - if (is_win) { - deps += [ "//base/trace_event/etw_manifest:chrome_events_win" ] - } - - allow_circular_includes_from = [ - "//base/debug", - "//base/memory", - "//base/process", - ] - - visibility = [ "//base/*" ] -} - -source_set("trace_event_unittests") { - testonly = true - sources = [ - "heap_profiler_allocation_context_tracker_unittest.cc", - "heap_profiler_allocation_register_unittest.cc", - "heap_profiler_heap_dump_writer_unittest.cc", - "heap_profiler_stack_frame_deduplicator_unittest.cc", - "heap_profiler_type_name_deduplicator_unittest.cc", - "java_heap_dump_provider_android_unittest.cc", - "memory_allocator_dump_unittest.cc", - "memory_dump_manager_unittest.cc", - "process_memory_dump_unittest.cc", - "process_memory_totals_dump_provider_unittest.cc", - "trace_config_memory_test_util.h", - "trace_config_unittest.cc", - "trace_event_argument_unittest.cc", - "trace_event_synthetic_delay_unittest.cc", - "trace_event_system_stats_monitor_unittest.cc", - "trace_event_unittest.cc", - "winheap_dump_provider_win_unittest.cc", - ] - - if (is_linux || is_android) { - sources += [ "process_memory_maps_dump_provider_unittest.cc" ] - } - - if (is_android) { - sources += [ "trace_event_android_unittest.cc" ] - } - - deps = [ - "//base/test:test_support", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/base/trace_event/etw_manifest/BUILD.gn b/base/trace_event/etw_manifest/BUILD.gn index 53f5520..1e16672 100644 --- a/base/trace_event/etw_manifest/BUILD.gn +++ b/base/trace_event/etw_manifest/BUILD.gn @@ -8,7 +8,7 @@ assert(is_win, "This only runs on Windows.") message_compiler("chrome_events_win") { visibility = [ - "//base/trace_event/*", + "//base/*", "//chrome:main_dll", ] |