Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 506368d5 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "installd: Create "lib" symlink with the correct label." am: 1120b649 

am: 7ee93b5f

Change-Id: I165b8f6c19859eb1b6550b99b2bafd5c7aa3c256
parents 77e0b98f 7ee93b5f

cmds/installd/InstalldNativeService.cpp

+13 −1
Original line number Diff line number Diff line
@@ -2046,8 +2046,14 @@ binder::Status InstalldNativeService::linkNativeLibraryDirectory( 
        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 @@ binder::Status InstalldNativeService::linkNativeLibraryDirectory( 
        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()) {