commit 1e795f03b2bd5cfafe4038a4a4c4d3cd93913e9a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 20 07:09:15 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 20 07:09:15 2024 +0000
tree 64be7a2bd8d61aa33d31f1bb3549f90082f3b538
parent 370a8fa9f54549b573768af5a26994ab06ae1e02
parent 1e1607cf717104ba1a06d0ee3f96c48d8e347a5b

Merge "Avoid dependency cycle from apexer to apexer" into main

apexd/apexd.cpp

diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp
index 8e539cf..a09e3d5 100644
--- a/apexd/apexd.cpp
+++ b/apexd/apexd.cpp
@@ -3675,16 +3675,10 @@
     if (force) {
       return Result<void>{};
     }
-    auto dirs = GetSubdirs(mount_point);
-    if (!dirs.ok()) {
-      return dirs.error();
-    }
-    if (std::find(dirs->begin(), dirs->end(), mount_point + "/app") !=
-        dirs->end()) {
+    if (access((mount_point + "/app").c_str(), F_OK) == 0) {
       return Error() << apex_file.GetPath() << " contains app inside";
     }
-    if (std::find(dirs->begin(), dirs->end(), mount_point + "/priv-app") !=
-        dirs->end()) {
+    if (access((mount_point + "/priv-app").c_str(), F_OK) == 0) {
       return Error() << apex_file.GetPath() << " contains priv-app inside";
     }
     if (IsVendorApex(apex_file)) {