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

Commit 3d8c00e8 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "view_compiler.cpp: clean up file descriptor handling" 

am: 72051fdd

Change-Id: I8b64aa76cd1f835dc38dcdc01ceaaf552695bb2c
parents 5aeb8841 72051fdd

cmds/installd/view_compiler.cpp

+3 −7
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ bool view_compiler(const char* apk_path, const char* package_name, const char* o 
    // and pass file descriptors.



    // Open input file

    unique_fd infd{open(apk_path, 0)};

    unique_fd infd{open(apk_path, O_RDONLY)}; // NOLINT(android-cloexec-open)

    if (infd.get() < 0) {

        PLOG(ERROR) << "Could not open input file: " << apk_path;

        return false;
@@ -53,7 +53,7 @@ bool view_compiler(const char* apk_path, const char* package_name, const char* o 


    // Set up output file. viewcompiler can't open outputs by fd, but it can write to stdout, so

    // we close stdout and open it towards the right output.

    unique_fd outfd{open(out_dex_file, O_CREAT | O_TRUNC | O_WRONLY, 0644)};

    unique_fd outfd{open(out_dex_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644)};

    if (outfd.get() < 0) {

        PLOG(ERROR) << "Could not open output file: " << out_dex_file;

        return false;
@@ -62,10 +62,6 @@ bool view_compiler(const char* apk_path, const char* package_name, const char* o 
        PLOG(ERROR) << "Could not change output file permissions";

        return false;

    }

    if (close(STDOUT_FILENO) != 0) {

        PLOG(ERROR) << "Could not close stdout";

        return false;

    }

    if (dup2(outfd, STDOUT_FILENO) < 0) {

        PLOG(ERROR) << "Could not duplicate output file descriptor";

        return false;

cmds/installd/view_compiler.h

+1 −1

File changed.

Contains only whitespace changes.