perfetto: fix amalgamated build
Change-Id: Id9b5784b7c21754174f3e73a687f03655c235563
diff --git a/Android.bp b/Android.bp
index 7df1b36..40d42c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -422,7 +422,6 @@
":perfetto_include_perfetto_ext_tracing_core_core",
":perfetto_include_perfetto_ext_tracing_ipc_ipc",
":perfetto_include_perfetto_protozero_protozero",
- ":perfetto_include_perfetto_tracing_all",
":perfetto_include_perfetto_tracing_core_core",
":perfetto_include_perfetto_tracing_core_forward_decls",
":perfetto_include_perfetto_tracing_tracing",
@@ -1010,11 +1009,6 @@
name: "perfetto_include_perfetto_trace_processor_trace_processor",
}
-// GN: //include/perfetto:tracing_all
-filegroup {
- name: "perfetto_include_perfetto_tracing_all",
-}
-
// GN: //include/perfetto/tracing/core:core
filegroup {
name: "perfetto_include_perfetto_tracing_core_core",
diff --git a/BUILD b/BUILD
index 465f426..b21e364 100644
--- a/BUILD
+++ b/BUILD
@@ -115,6 +115,7 @@
perfetto_cc_binary(
name = "client_api_example",
srcs = [
+ "include/perfetto/tracing.h",
"test/client_api_example.cc",
":include_perfetto_base_base",
":include_perfetto_protozero_protozero",
@@ -480,14 +481,6 @@
],
)
-# GN target: //include/perfetto:tracing_all
-filegroup(
- name = "include_perfetto_tracing_all",
- srcs = [
- "include/perfetto/tracing.h",
- ],
-)
-
# GN target: //src/android_internal:headers
filegroup(
name = "src_android_internal_headers",
@@ -2421,6 +2414,7 @@
perfetto_cc_library(
name = "libperfetto_client_experimental",
srcs = [
+ "include/perfetto/tracing.h",
":src_base_base",
":src_base_unix_socket",
":src_ipc_ipc",
@@ -2438,7 +2432,6 @@
":include_perfetto_ext_tracing_core_core",
":include_perfetto_ext_tracing_ipc_ipc",
":include_perfetto_protozero_protozero",
- ":include_perfetto_tracing_all",
":include_perfetto_tracing_core_core",
":include_perfetto_tracing_core_forward_decls",
":include_perfetto_tracing_tracing",
diff --git a/BUILD.gn b/BUILD.gn
index 33663fd..4fdd937 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -213,11 +213,13 @@
complete_static_lib = true
public_deps = [
"gn:default_deps",
- "include/perfetto:tracing_all",
"src/tracing",
"src/tracing:client_api",
"src/tracing:platform_posix",
]
+ sources = [
+ "include/perfetto/tracing.h",
+ ]
assert_no_deps = [ "//gn:protobuf_lite" ]
}
}
diff --git a/include/perfetto/BUILD.gn b/include/perfetto/BUILD.gn
deleted file mode 100644
index 83616e6..0000000
--- a/include/perfetto/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Publically exposes all tracing related headers wrapped up in a
-# single, convenient header file that clients can depend on.
-source_set("tracing_all") {
- public_deps = [
- "tracing",
- ]
- sources = [
- "tracing.h",
- ]
-}
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 3388f02..f3dc459 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -55,6 +55,7 @@
executable("client_api_example") {
sources = [
+ "../include/perfetto/tracing.h",
"client_api_example.cc",
]
deps = [
