commit b753c5a9de69e4e0e4e6973986eb580af4baf99a
author Thiébaud Weksteen <tweek@google.com> Thu Sep 16 15:03:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 16 15:03:31 2021 +0000
tree 4257bc0a5b6bea8073155d4c3a52525943f84f9a
parent 71c4ccd5c449e3ce5a6ecb1ca1fa408a10d5451b
parent 4622dfddb5ed140646092bb65f8055a7aab9b9e7

Merge "Replace security_context_t type" am: 0568338670 am: 760547e263 am: 4622dfddb5

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

Change-Id: I944481dc367f3212285535543d57a8212e11da07

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index be2c702..8f1c01a 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -52,7 +52,7 @@
 }
 
 struct SecurityContext_Delete {
-    void operator()(security_context_t p) const {
+    void operator()(char* p) const {
         freecon(p);
     }
 };
@@ -108,7 +108,7 @@
         }
         if (is_selinux_enabled() && seLinuxContext.size() > 0) {
             String8 seLinuxContext8(seLinuxContext);
-            security_context_t tmp = nullptr;
+            char* tmp = nullptr;
             getfilecon(fullPath.string(), &tmp);
             Unique_SecurityContext context(tmp);
             if (checkWrite) {