commit 3605a85663c9d777a60d161fe9e5eef23a49d40a
author Thiébaud Weksteen <tweek@google.com> Thu Sep 16 15:32:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 16 15:32:04 2021 +0000
tree 9ecee1b7d2d4fda560938a19c465ff803f49d921
parent 42649635ddc372df66abc5760c811b5229ecc437
parent 00e163d9dcca9ae3928c611ce9f3611f942386e5

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

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

Change-Id: I5e3d62b0a300c7065399653bc0b995070fa6315e

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