commit 4622dfddb5ed140646092bb65f8055a7aab9b9e7
author Thiébaud Weksteen <tweek@google.com> Thu Sep 16 14:39:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 16 14:39:23 2021 +0000
tree 9f14c9cebf0567b090861e3352c0cd4cb75d276c
parent 55bae46ca1de06925b66c6a03440e89b18818d75
parent 760547e263d419c6d2fdd62f109968a86c90d356

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

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

Change-Id: I06184926d64ca1b7582ce593fb90d5392e7dd43f

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) {