diff options
author | Xin Li <delphij@google.com> | 2024-01-17 22:13:58 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-01-17 22:13:58 -0800 |
commit | 28d03a2a1cabbe01d7bcb6cf5166c10e50d3c2c6 (patch) | |
tree | c1643be8ab17fc607cea748a8bb1d621a5964873 /pw_rpc/CMakeLists.txt | |
parent | ec2628a6ba2d0ecbe3ac10c8c772f6fc6acc345d (diff) | |
parent | f054515492af5132f685cb23fe11891ee77104c9 (diff) | |
download | pigweed-28d03a2a1cabbe01d7bcb6cf5166c10e50d3c2c6.tar.gz |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: Iba357b308a79d0c8b560acd4f72b5423c9c83294
Change-Id: Icdf552029fb97a34e83c6dd7799433fc473a2506
Diffstat (limited to 'pw_rpc/CMakeLists.txt')
-rw-r--r-- | pw_rpc/CMakeLists.txt | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pw_rpc/CMakeLists.txt b/pw_rpc/CMakeLists.txt index 37b7cb0c9..4d95c180d 100644 --- a/pw_rpc/CMakeLists.txt +++ b/pw_rpc/CMakeLists.txt @@ -61,9 +61,6 @@ pw_add_library(pw_rpc.server STATIC pw_log pw_rpc.log_config ) -if(Zephyr_FOUND AND CONFIG_PIGWEED_RPC_SERVER) - zephyr_link_libraries(pw_rpc.server) -endif() pw_add_library(pw_rpc.client STATIC HEADERS @@ -83,9 +80,6 @@ pw_add_library(pw_rpc.client STATIC pw_log pw_rpc.log_config ) -if(Zephyr_FOUND AND CONFIG_PIGWEED_RPC_CLIENT) - zephyr_link_libraries(pw_rpc.client) -endif() pw_add_library(pw_rpc.client_server STATIC HEADERS @@ -98,14 +92,12 @@ pw_add_library(pw_rpc.client_server STATIC SOURCES client_server.cc ) -if(Zephyr_FOUND AND CONFIG_PIGWEED_RPC_CLIENT_SERVER) - zephyr_link_libraries(pw_rpc.client_server) -endif() pw_add_library(pw_rpc.synchronous_client_api INTERFACE HEADERS public/pw_rpc/synchronous_call.h public/pw_rpc/synchronous_call_result.h + public/pw_rpc/internal/synchronous_call_impl.h PUBLIC_INCLUDES public PUBLIC_DEPS @@ -170,10 +162,6 @@ if(NOT "${pw_thread.yield_BACKEND}" STREQUAL "") pw_target_link_targets(pw_rpc.common PUBLIC pw_thread.yield) endif() -if(Zephyr_FOUND AND CONFIG_PIGWEED_RPC_COMMON) - zephyr_link_libraries(pw_rpc.common) -endif() - pw_add_library(pw_rpc.fake_channel_output STATIC HEADERS public/pw_rpc/internal/fake_channel_output.h @@ -253,10 +241,10 @@ pw_add_library(pw_rpc.test_utils INTERFACE public/pw_rpc/internal/fake_channel_output.h public/pw_rpc/internal/method_impl_tester.h public/pw_rpc/internal/method_info_tester.h - public/pw_rpc/internal/test_method.h public/pw_rpc/internal/test_method_context.h public/pw_rpc/internal/test_utils.h pw_rpc_private/fake_server_reader_writer.h + pw_rpc_private/test_method.h PUBLIC_INCLUDES public PUBLIC_DEPS @@ -343,6 +331,7 @@ pw_add_test(pw_rpc.packet_test packet_test.cc PRIVATE_DEPS pw_bytes + pw_fuzzer.fuzztest pw_protobuf pw_rpc.server GROUPS @@ -355,6 +344,7 @@ pw_add_test(pw_rpc.packet_meta_test packet_meta_test.cc PRIVATE_DEPS pw_bytes + pw_fuzzer.fuzztest pw_rpc.server GROUPS modules |