Reshuffle include/ directory layout
This CL reorganizes the include/ directory as follows:
1. The immediate subdirectories of include/ are now the stable API
surface exposed to all embedders, with the exception of ext/.
2. ext/ contains the unstable API surface that is exposed only to chrome.
Test: builds on all configurations and passes tests
Bug: 132678367
Change-Id: If638d4b4c150fd591cd1db851283b25ff6083ed6
diff --git a/Android.bp b/Android.bp
index 4e02f6b..f77e7bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,7 +100,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/trace_writer_base.cc",
"src/tracing/core/chrome_config.cc",
"src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
@@ -122,6 +121,7 @@
"src/tracing/core/trace_writer_impl.cc",
"src/tracing/core/tracing_service_impl.cc",
"src/tracing/core/virtual_destructors.cc",
+ "src/tracing/trace_writer_base.cc",
],
shared_libs: [
"libbase",
@@ -265,7 +265,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/trace_writer_base.cc",
"src/traced/probes/android_log/android_log_data_source.cc",
"src/traced/probes/filesystem/file_scanner.cc",
"src/traced/probes/filesystem/fs_mount.cc",
@@ -321,6 +320,7 @@
"src/tracing/core/trace_writer_impl.cc",
"src/tracing/core/tracing_service_impl.cc",
"src/tracing/core/virtual_destructors.cc",
+ "src/tracing/trace_writer_base.cc",
],
shared_libs: [
"liblog",
@@ -449,7 +449,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/trace_writer_base.cc",
"src/tracing/core/chrome_config.cc",
"src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
@@ -471,6 +470,7 @@
"src/tracing/core/trace_writer_impl.cc",
"src/tracing/core/tracing_service_impl.cc",
"src/tracing/core/virtual_destructors.cc",
+ "src/tracing/trace_writer_base.cc",
],
shared_libs: [
"libandroid",
@@ -621,16 +621,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/api_integrationtest.cc",
- "src/public/data_source.cc",
- "src/public/internal/in_process_tracing_backend.cc",
- "src/public/internal/system_tracing_backend.cc",
- "src/public/internal/tracing_muxer_impl.cc",
- "src/public/platform.cc",
- "src/public/platform_posix.cc",
- "src/public/trace_writer_base.cc",
- "src/public/tracing.cc",
- "src/public/virtual_destructors.cc",
"src/traced/probes/android_log/android_log_data_source.cc",
"src/traced/probes/filesystem/file_scanner.cc",
"src/traced/probes/filesystem/fs_mount.cc",
@@ -663,6 +653,7 @@
"src/traced/probes/probes_producer.cc",
"src/traced/probes/ps/process_stats_data_source.cc",
"src/traced/probes/sys_stats/sys_stats_data_source.cc",
+ "src/tracing/api_integrationtest.cc",
"src/tracing/core/chrome_config.cc",
"src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
@@ -684,6 +675,15 @@
"src/tracing/core/trace_writer_impl.cc",
"src/tracing/core/tracing_service_impl.cc",
"src/tracing/core/virtual_destructors.cc",
+ "src/tracing/data_source.cc",
+ "src/tracing/internal/in_process_tracing_backend.cc",
+ "src/tracing/internal/system_tracing_backend.cc",
+ "src/tracing/internal/tracing_muxer_impl.cc",
+ "src/tracing/platform.cc",
+ "src/tracing/platform_posix.cc",
+ "src/tracing/trace_writer_base.cc",
+ "src/tracing/tracing.cc",
+ "src/tracing/virtual_destructors.cc",
"test/end_to_end_integrationtest.cc",
"test/fake_producer.cc",
"test/task_runner_thread.cc",
@@ -2729,7 +2729,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/trace_writer_base.cc",
"src/tracing/core/chrome_config.cc",
"src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
@@ -2758,6 +2757,7 @@
"src/tracing/ipc/service/consumer_ipc_service.cc",
"src/tracing/ipc/service/producer_ipc_service.cc",
"src/tracing/ipc/service/service_ipc_host_impl.cc",
+ "src/tracing/trace_writer_base.cc",
],
shared_libs: [
"libprotobuf-cpp-lite",
@@ -3018,7 +3018,6 @@
"src/protozero/scattered_stream_writer_unittest.cc",
"src/protozero/test/fake_scattered_buffer.cc",
"src/protozero/test/protozero_conformance_unittest.cc",
- "src/public/trace_writer_base.cc",
"src/traced/probes/android_log/android_log_data_source.cc",
"src/traced/probes/android_log/android_log_data_source_unittest.cc",
"src/traced/probes/filesystem/file_scanner.cc",
@@ -3114,6 +3113,7 @@
"src/tracing/test/mock_producer.cc",
"src/tracing/test/test_shared_memory.cc",
"src/tracing/test/tracing_integration_test.cc",
+ "src/tracing/trace_writer_base.cc",
"tools/ftrace_proto_gen/ftrace_descriptor_gen.cc",
"tools/ftrace_proto_gen/ftrace_proto_gen.cc",
"tools/ftrace_proto_gen/ftrace_proto_gen_unittest.cc",
@@ -3456,7 +3456,6 @@
"src/protozero/scattered_heap_buffer.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/public/trace_writer_base.cc",
"src/tracing/core/chrome_config.cc",
"src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
@@ -3478,6 +3477,7 @@
"src/tracing/core/trace_writer_impl.cc",
"src/tracing/core/tracing_service_impl.cc",
"src/tracing/core/virtual_destructors.cc",
+ "src/tracing/trace_writer_base.cc",
],
shared_libs: [
"liblog",