Client Library: temporarily re-link full library in Android
This is effectively a revert of aosp/1218897. This re-regresses
the libsurfaceflinger.so binary size but fixes the test.
I will re-address this next week, but unbreak the test for now.
Bug: 148517641
Bug: 148198993
Change-Id: I39f6d48ef3a8f50ad3b0f739ada7b64cbead7a3d
diff --git a/Android.bp b/Android.bp
index 862a044..d39fb8e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -479,11 +479,10 @@
":perfetto_src_ipc_host",
":perfetto_src_protozero_protozero",
":perfetto_src_tracing_client_api_base",
- ":perfetto_src_tracing_client_api_system_backend_only",
":perfetto_src_tracing_common",
":perfetto_src_tracing_core_core",
":perfetto_src_tracing_core_service",
- ":perfetto_src_tracing_in_process_backend_fake",
+ ":perfetto_src_tracing_in_process_backend",
":perfetto_src_tracing_ipc_common",
":perfetto_src_tracing_ipc_consumer_consumer",
":perfetto_src_tracing_ipc_producer_producer",
@@ -6514,11 +6513,6 @@
],
}
-// GN: //src/tracing:client_api_system_backend_only
-filegroup {
- name: "perfetto_src_tracing_client_api_system_backend_only",
-}
-
// GN: //src/tracing:common
filegroup {
name: "perfetto_src_tracing_common",
@@ -6596,14 +6590,6 @@
],
}
-// GN: //src/tracing:in_process_backend_fake
-filegroup {
- name: "perfetto_src_tracing_in_process_backend_fake",
- srcs: [
- "src/tracing/internal/in_process_tracing_backend_fake.cc",
- ],
-}
-
// GN: //src/tracing/ipc:common
filegroup {
name: "perfetto_src_tracing_ipc_common",
diff --git a/BUILD.gn b/BUILD.gn
index c57fd69..6972e58 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -215,14 +215,15 @@
"src/tracing/core",
]
- if (perfetto_build_with_android) {
- # Android in-tree builds expose only the system backend and don't expose
- # the in-process backend. This is to save binary size and memory (see
- # b/148198993).
- public_deps += [ "src/tracing:client_api_system_backend_only" ]
- } else {
- public_deps += [ "src/tracing:client_api" ]
- }
+ # TODO(primiano): in Android this target should be split in full / light,
+ # where light depends on client_api_system_backend_only instead of
+ # client_api (see r.android.com/1218897).
+ # The full client_api is too big binary-size-wise for production (see
+ # b/148198993). However, tests want to use the full library because having
+ # an in-house service is more convenient.
+ # As a stop-gap solution to b/148517641 we re-link the full library by
+ # default in Android.
+ public_deps += [ "src/tracing:client_api" ]
sources = [ "include/perfetto/tracing.h" ]
assert_no_deps = [ "//gn:protobuf_lite" ]
}