commit 760547e263d419c6d2fdd62f109968a86c90d356
author Thiébaud Weksteen <tweek@google.com> Thu Sep 16 14:30:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 16 14:30:14 2021 +0000
tree 615318edcdb61c8488bed99faa1fb6f1741bf147
parent 774787c7cee4e767a1eb465908e7ed38278297ba
parent 056833867010364a8abce72975e100be6768e0a9

Merge "Replace security_context_t type" am: 0568338670

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

Change-Id: Ia05aa493bef7825f5f7af7a49e65de688c22996b

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