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

Commit 1fe21bd1 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Never call app_main more than once 

Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.

Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.

Bug: 8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
parent 1ae6ae20

cmds/app_process/app_main.cpp

+3 −4
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include <utils/Log.h>

#include <cutils/process_name.h>

#include <cutils/memory.h>

#include <cutils/properties.h>

#include <android_runtime/AndroidRuntime.h>

#include <sys/personality.h>



#include <stdlib.h>

#include <stdio.h>

#include <unistd.h>
@@ -144,12 +144,11 @@ int main(int argc, char* const argv[]) 
     * This breaks some programs which improperly embed

     * an out of date copy of Android's linker.

     */

    char value[PROPERTY_VALUE_MAX];

    property_get("ro.kernel.qemu", value, "");

    if (strcmp(value, "1") != 0) {

    if (getenv("NO_ADDR_COMPAT_LAYOUT_FIXUP") == NULL) {

        int current = personality(0xFFFFFFFF);

        if ((current & ADDR_COMPAT_LAYOUT) == 0) {

            personality(current | ADDR_COMPAT_LAYOUT);

            setenv("NO_ADDR_COMPAT_LAYOUT_FIXUP", "1", 1);

            execv("/system/bin/app_process", argv);

            return -1;

        }