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

Commit 9ba5c7f1 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Merge "zygote to preload public native libraries" 

am: 38b839ca

* commit '38b839ca':
  zygote to preload public native libraries
parents 7f849c2c 38b839ca

cmds/app_process/Android.mk

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

    liblog \

    libbinder \

    libnativeloader \

    libandroid_runtime \

    $(app_process_common_shared_libs) \

cmds/app_process/app_main.cpp

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

#include <cutils/properties.h>

#include <cutils/trace.h>

#include <nativeloader/native_loader.h>

#include <android_runtime/AndroidRuntime.h>

#include <private/android_filesystem_config.h>  // for AID_SYSTEM
@@ -304,6 +305,7 @@ int main(int argc, char* const argv[]) 
    }



    if (zygote) {

        PreloadPublicNativeLibraries();

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

    } else if (className) {

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