commit 5855f5a09b444cddccd6bcaa7e38737b4e92a4e4
author Tomasz Wasilczyk <twasilczyk@google.com> Sat Sep 02 02:34:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 02 02:34:00 2023 +0000
tree e215b5548e3e4890bb0efb5cd9e6919e1c11557c
parent 6df881a31febed1ecc1ac8718d2a15cd53becac4
parent e4229ae205c17e6f7694e142f49ff8f16bcea63a

Merge "Migrate from android::String path functions to std::filesystem" into main am: 0d0326fd9a am: c5a3087b46 am: cabb9a4530 am: 1e3b507f85 am: e4229ae205

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2721818

Change-Id: I35d262506f24b5884cc75489009020413473dffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/cmd/Android.bp

diff --git a/cmds/cmd/Android.bp b/cmds/cmd/Android.bp
index c3d2601..27ef788 100644
--- a/cmds/cmd/Android.bp
+++ b/cmds/cmd/Android.bp
@@ -27,6 +27,9 @@
         "libselinux",
         "libbinder",
     ],
+    whole_static_libs: [
+        "libc++fs",
+    ],
 
     cflags: [
         "-Wall",

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index b727398..0ce7711 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -27,6 +27,7 @@
 #include <utils/Mutex.h>
 #include <utils/Vector.h>
 
+#include <filesystem>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -69,10 +70,8 @@
     virtual int openFile(const String16& path, const String16& seLinuxContext,
             const String16& mode) {
         String8 path8(path);
-        char cwd[256];
-        getcwd(cwd, 256);
-        String8 fullPath(cwd);
-        fullPath.appendPath(path8);
+        auto fullPath = std::filesystem::current_path();
+        fullPath /= path8.c_str();
         if (!mActive) {
             mErrorLog << "Open attempt after active for: " << fullPath << endl;
             return -EPERM;