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

Commit 32c1169a authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Android (Google) Code Review
Browse files

Merge "zygote: Remove NativeLoader initialization step" into nyc-dev

parents 5149abe7 3088ff85

cmds/app_process/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libutils \

    liblog \

    liblog \

    libbinder \

    libbinder \

    libnativeloader \

    libandroid_runtime \

    libandroid_runtime \

    $(app_process_common_shared_libs) \

    $(app_process_common_shared_libs) \

cmds/app_process/app_main.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <cutils/properties.h>

#include <cutils/properties.h>

#include <cutils/trace.h>

#include <cutils/trace.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/AndroidRuntime.h>

#include <nativeloader/native_loader.h>

#include <private/android_filesystem_config.h>  // for AID_SYSTEM

#include <private/android_filesystem_config.h>  // for AID_SYSTEM





namespace android {

namespace android {
@@ -305,7 +304,6 @@ int main(int argc, char* const argv[]) 
    }

    }





    if (zygote) {

    if (zygote) {

        InitializeNativeLoader();

        runtime.start("com.android.internal.os.ZygoteInit", args, zygote);

        runtime.start("com.android.internal.os.ZygoteInit", args, zygote);

    } else if (className) {

    } else if (className) {

        runtime.start("com.android.internal.os.RuntimeInit", args, zygote);

        runtime.start("com.android.internal.os.RuntimeInit", args, zygote);