libc++fs is part of libc++ now.

Bug: janitorial cleanup
Test: treehugger
Change-Id: Ie4805bebc3b10612dd94d831c16e61c58f0ea73d

10 files changed, 1 insertions, 15 deletions

diff --git a/android/app/Android.bp b/android/app/Android.bp
index adabf5ae9d..bc4d482acd 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -131,7 +131,6 @@ cc_library_shared {
         "libbte",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libchrome",
         "libcutils",
         "libevent",
@@ -192,7 +191,6 @@ cc_library {
         "libosi",
 
         "libbluetooth-types",
-        "libc++fs",
     ],
     cflags: [
         /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 96e6027d14..b741463cbe 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -628,7 +628,6 @@ cc_test {
         "libbtdevice",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libchrome",
         "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
@@ -751,7 +750,6 @@ cc_test {
         "libbtdevice",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libchrome",
         "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index 5bcea9ffb1..a30de4acb3 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -168,7 +168,6 @@ cc_defaults {
         "libbluetooth_l2cap_pdl",
         "libbluetooth_ras_pdl",
         "libbluetooth_smp_pdl",
-        "libc++fs",
     ],
     static_libs: [
         "libbase",
@@ -498,7 +497,6 @@ cc_test {
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
-        "libc++fs",
         "libchrome",
         "libcom.android.sysprop.bluetooth.wrapped",
         "libflagtest",
diff --git a/system/gd/os/linux_generic/files.cc b/system/gd/os/linux_generic/files.cc
index 1aa988422d..61f7c61859 100644
--- a/system/gd/os/linux_generic/files.cc
+++ b/system/gd/os/linux_generic/files.cc
@@ -108,7 +108,7 @@ bool WriteToFile(const std::string& path, const std::string& data) {
   const std::string temp_path = path + ".new";
 
   // Extract directory from file path (e.g. /data/misc/bluedroid).
-  // libc++fs is not supported in APEX yet and hence cannot use std::filesystem::path::parent_path
+  // TODO: switch to std::filesystem::path::parent_path
   std::string directory_path;
   {
     // Make a temporary variable as inputs to dirname() will be modified and return value points to input char array
diff --git a/system/gd/packet/parser/Android.bp b/system/gd/packet/parser/Android.bp
index 21b9eb5cf6..e1b50bfda7 100644
--- a/system/gd/packet/parser/Android.bp
+++ b/system/gd/packet/parser/Android.bp
@@ -45,9 +45,6 @@ cc_binary_host {
         "struct_def.cc",
         "struct_parser_generator.cc",
     ],
-    static_libs: [
-        "libc++fs",
-    ],
     yacc: {
         gen_location_hh: true,
         gen_position_hh: true,
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index 5bb81175ee..c7c79cb0cc 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -67,7 +67,6 @@ rust_defaults {
         "libbthalutils",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index f3c7fadd3d..dbf9273f66 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -145,7 +145,6 @@ cc_test {
         "libbt-common",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
-        "libc++fs",
         "libchrome",
         "libevent",
         "libgmock",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index e63a8db30b..f51d9cfe29 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -112,7 +112,6 @@ cc_binary {
         "libbte",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index a0d2e3e369..1eebdda912 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -88,7 +88,6 @@ cc_defaults {
         "libbte",
         "libbtif",
         "libbtif-core",
-        "libc++fs",
         "libcom.android.sysprop.bluetooth.wrapped",
         "libflatbuffers-cpp",
         "libg722codec",
diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index a8dc2b6a39..c28ad576fc 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -393,7 +393,6 @@ cc_binary_host {
     ],
     static_libs: [
         "breakpad_client",
-        "libc++fs",
         "libcrypto",
         "libgflags",
         "libprotobuf-cpp-full",