pw_allocator: Fix Android.bp

Change-Id: I114a9fa790a1e703442f98efd2d0f15d84e3aa3b
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/250332
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Aaron Green <aarongreen@google.com>
Reviewed-by: Matthew Sedam <matthewsedam@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Carlos Chinchilla <cachinchilla@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Docs-Not-Needed: Aaron Green <aarongreen@google.com>

pw_allocator/Android.bp

@@ -20,18 +20,24 @@ cc_library {
     name: "pw_allocator",
     cpp_std: "c++20",
     vendor_available: true,
-    export_include_dirs: ["public"],
+    export_include_dirs: [
+        "public",
+        "block/public",
+    ],
     defaults: [
         "pw_android_common_backends",
     ],
     header_libs: [
         "pw_assert",
-        "pw_log",
+        "fuchsia_sdk_lib_stdcompat",
     ],
     export_header_lib_headers: [
         "pw_assert",
+        "fuchsia_sdk_lib_stdcompat",
     ],
     export_static_lib_headers: [
+        "pw_bytes",
+        "pw_containers",
         "pw_metric",
         "pw_preprocessor",
         "pw_result",
@@ -43,13 +49,13 @@ cc_library {
     srcs: [
         "allocator.cc",
         "allocator_as_pool.cc",
-        "block.cc",
+        "block/contiguous.cc",
+        "block/poisonable.cc",
         "chunk_pool.cc",
         "libc_allocator.cc",
         "unique_ptr.cc",
     ],
     static_libs: [
-        "pw_base64",
         "pw_bytes",
         "pw_containers",
         "pw_metric",
@@ -58,6 +64,5 @@ cc_library {
         "pw_span",
         "pw_status",
         "pw_tokenizer",
-        "pw_tokenizer_base64",
     ],
 }

pw_allocator/BUILD.bazel

@@ -52,11 +52,8 @@ cc_library(
     ],
     strip_include_prefix = "public",
     deps = [
-        ":config",
         ":deallocator",
-        "//pw_assert",
         "//pw_result",
-        "//pw_status",
     ],
 )
 

pw_allocator/BUILD.gn

@@ -60,9 +60,7 @@ pw_source_set("allocator") {
   public_configs = [ ":public_include_path" ]
   public = [ "public/pw_allocator/allocator.h" ]
   public_deps = [
-    ":config",
     ":deallocator",
-    "$dir_pw_assert:check",
     dir_pw_result,
   ]
   sources = [ "allocator.cc" ]

pw_allocator/CMakeLists.txt

@@ -42,7 +42,6 @@ pw_add_library(pw_allocator.allocator STATIC
     public
   PUBLIC_DEPS
     pw_allocator.deallocator
-    pw_assert.check
     pw_result
   SOURCES
     allocator.cc