Move heap_profile to a separate include dir.
The previous setup caused trouble for people trying to create a prebuilt
of this library, because soong would bundle all of the Perfetto headers
with it. This is unnecessary and causes problems because now the
prebuilt can clash with other Perfetto targets.
Test: make heapprofd_client_api
Test: make heapprofd_api_noop
Test: m
Test: ninja -C out/linux_clang_release
Bug: 179915934
Change-Id: I1458e496ba2c482fb37629db7e93d96faa99603a
diff --git a/Android.bp b/Android.bp
index 948d3a9..c537e9e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -167,13 +167,20 @@
srcs: [
"src/profiling/memory/client_api_noop.cc",
],
+ host_supported: true,
export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
+ "src/profiling/memory/include",
],
defaults: [
"perfetto_defaults",
],
+ version_script: "src/profiling/memory/heapprofd_client_api.map.txt",
+ stubs: {
+ symbol_file: "src/profiling/memory/heapprofd_client_api.map.txt",
+ versions: [
+ "S",
+ ],
+ },
}
// GN: //src/profiling/memory:heapprofd_client
@@ -192,10 +199,6 @@
static_libs: [
"libasync_safe",
],
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
generated_headers: [
"perfetto_src_base_version_gen_h",
],
@@ -239,8 +242,7 @@
"libasync_safe",
],
export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
+ "src/profiling/memory/include",
],
generated_headers: [
"perfetto_src_base_version_gen_h",
@@ -359,8 +361,7 @@
"libunwindstack",
],
export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
+ "src/profiling/memory/include",
],
generated_headers: [
"perfetto_protos_perfetto_common_cpp_gen_headers",
@@ -643,10 +644,6 @@
"libhealthhalutils",
"libstatslog_perfetto",
],
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
defaults: [
"perfetto_defaults",
],
@@ -1109,10 +1106,6 @@
whole_static_libs: [
"perfetto_gtest_logcat_printer",
],
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
generated_headers: [
"perfetto_protos_perfetto_common_cpp_gen_headers",
"perfetto_protos_perfetto_common_zero_gen_headers",
@@ -1352,10 +1345,6 @@
":perfetto_src_tracing_ipc_service_service",
":perfetto_test_test_helper",
],
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
generated_headers: [
"perfetto_protos_perfetto_common_cpp_gen_headers",
"perfetto_protos_perfetto_common_zero_gen_headers",
@@ -1500,6 +1489,7 @@
"external/perfetto",
"external/perfetto/include",
"external/perfetto/include/perfetto/base/build_configs/android_tree",
+ "external/perfetto/src/profiling/memory/include",
],
product_variables: {
debuggable: {
@@ -1525,10 +1515,6 @@
"libgmock",
"libgtest",
],
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
defaults: [
"perfetto_defaults",
],
@@ -8601,10 +8587,6 @@
"libprotobuf-cpp-lite",
],
host_supported: true,
- export_include_dirs: [
- "include",
- "include/perfetto/base/build_configs/android_tree",
- ],
generated_headers: [
"perfetto_protos_perfetto_common_lite_gen_headers",
"perfetto_protos_perfetto_config_android_lite_gen_headers",