build: Update Android.bp

Change-Id: Ic00a88aa7400e2e14f04b7081a73c04ed93b556e Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/120213 Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com> Pigweed-Auto-Submit: Victor Berchet <berchet@google.com> Reviewed-by: Keir Mierle <keir@google.com>
google · Nov 18, 2022 · 3d5a585 · 3d5a585
1 parent f4f3824
commit 3d5a585
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 150 deletions.
diff --git a/pw_bytes/Android.bp b/pw_bytes/Android.bp
@@ -31,5 +31,6 @@ cc_library_static {
     ],
     static_libs: [
         "pw_containers",
+        "pw_status",
     ],
-}
+}
diff --git a/pw_rpc/Android.bp b/pw_rpc/Android.bp
@@ -54,75 +54,3 @@ java_library_static {
     srcs: ["echo.proto"],
     sdk_version: "current",
 }
-
-cc_library_static {
-    name: "pw_rpc",
-    cpp_std: "c++2a",
-    vendor_available: true,
-    export_include_dirs: [
-        "public",
-    ],
-    header_libs: [
-        "fuschia_sdk_lib_fit",
-        "fuschia_sdk_lib_stdcompat",
-        "pw_assert_headers",
-        "pw_assert_log_headers",
-        "pw_function_headers",
-        "pw_log_headers",
-        "pw_log_null_headers",
-        "pw_polyfill_headers",
-        "pw_preprocessor_headers",
-        "pw_result_headers",
-        "pw_span_headers",
-        "pw_sync_baremetal_headers",
-        "pw_sync_headers",
-    ],
-    export_header_lib_headers: [
-        "fuschia_sdk_lib_fit",
-        "fuschia_sdk_lib_stdcompat",
-        "pw_assert_headers",
-        "pw_assert_log_headers",
-        "pw_function_headers",
-        "pw_log_headers",
-        "pw_log_null_headers",
-        "pw_polyfill_headers",
-        "pw_preprocessor_headers",
-        "pw_result_headers",
-        "pw_span_headers",
-        "pw_sync_baremetal_headers",
-        "pw_sync_headers",
-    ],
-    static_libs: [
-        "pw_bytes",
-        "pw_containers",
-        "pw_protobuf",
-        "pw_status",
-        "pw_stream",
-        "pw_string",
-        "pw_varint",
-    ],
-    export_static_lib_headers: [
-        "pw_bytes",
-        "pw_containers",
-        "pw_protobuf",
-        "pw_status",
-        "pw_stream",
-        "pw_string",
-        "pw_varint",
-    ],
-    srcs: [
-        "call.cc",
-        "channel.cc",
-        "channel_list.cc",
-        "client.cc",
-        "client_call.cc",
-        "endpoint.cc",
-        "packet.cc",
-        "packet_meta.cc",
-        "server.cc",
-        "server_call.cc",
-        "service.cc",
-    ],
-    cflags: ["-DPW_RPC_USE_GLOBAL_MUTEX=0"],
-    host_supported: true,
-}
diff --git a/pw_rpc/nanopb/Android.bp b/pw_rpc/nanopb/Android.bp
diff --git a/pw_rpc/raw/Android.bp b/pw_rpc/raw/Android.bp
diff --git a/pw_span/Android.bp b/pw_span/Android.bp
@@ -21,5 +21,8 @@ cc_library_headers {
     vendor_available: true,
     cpp_std: "c++2a",
     export_include_dirs: ["public"],
+    header_libs: [
+        "pw_polyfill_headers",
+    ],
     host_supported: true,
 }
diff --git a/pw_string/Android.bp b/pw_string/Android.bp
@@ -20,10 +20,23 @@ cc_library_static {
     name: "pw_string",
     vendor_available: true,
     export_include_dirs: ["public"],
+    header_libs: [
+        "pw_assert_headers",
+        "pw_assert_log_headers",
+        "pw_log_headers",
+        "pw_log_null_headers",
+        "pw_polyfill_headers",
+        "pw_preprocessor_headers",
+        "pw_result_headers",
+        "pw_span_headers",
+    ],
     host_supported: true,
     srcs: [
         "format.cc",
         "string_builder.cc",
         "type_to_string.cc",
     ],
-}
+    static_libs: [
+        "pw_status",
+    ],
+}