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

Commit 0f4793a4 authored by Jorge Lucangeli Obes's avatar Jorge Lucangeli Obes Committed by android-build-merger
Browse files

Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff am: ec43ed7d 

am: cfea3d9b

Change-Id: I27a191f4f03b47c05f8c0809e7bbc8966cbaa5fa
parents 5ac2d1b9 cfea3d9b

init/init.cpp

+0 −4
Original line number Diff line number Diff line
@@ -352,10 +352,6 @@ static int set_mmap_rnd_bits_action(const std::vector<std::string>& args) 
    LOG(ERROR) << "Unknown architecture";

#endif



#ifdef __BRILLO__

    // TODO: b/27794137

    ret = 0;

#endif

    if (ret == -1) {

        LOG(ERROR) << "Unable to set adequate mmap entropy value!";

        security_failure();