commit 506368d523c13c063a2c1b5a0a5241f8b2888432
author Nick Kralevich <nnk@google.com> Thu Jan 31 02:45:53 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 02:45:53 2019 -0800
tree 77edc2d46cfbad58c7be1944fa987ebb6a73217b
parent 77e0b98fb1c15eb4bd9da3f5b4d2bd4a54786f4c
parent 7ee93b5f1126ff467c7171854c6671e6cf5f4eb9

Merge "installd: Create "lib" symlink with the correct label." am: 1120b649f6
am: 7ee93b5f11

Change-Id: I165b8f6c19859eb1b6550b99b2bafd5c7aa3c256

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 7da5642..8146cc6 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2046,8 +2046,14 @@
         return error("Failed to stat " + _pkgdir);
     }
 
+    char *con = nullptr;
+    if (lgetfilecon(pkgdir, &con) < 0) {
+        return error("Failed to lgetfilecon " + _pkgdir);
+    }
+
     if (chown(pkgdir, AID_INSTALL, AID_INSTALL) < 0) {
-        return error("Failed to chown " + _pkgdir);
+        res = error("Failed to chown " + _pkgdir);
+        goto out;
     }
 
     if (chmod(pkgdir, 0700) < 0) {
@@ -2079,7 +2085,13 @@
         goto out;
     }
 
+    if (lsetfilecon(libsymlink, con) < 0) {
+        res = error("Failed to lsetfilecon " + _libsymlink);
+        goto out;
+    }
+
 out:
+    free(con);
     if (chmod(pkgdir, s.st_mode) < 0) {
         auto msg = "Failed to cleanup chmod " + _pkgdir;
         if (res.isOk()) {