Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dimitry Ivanov
2016-04-27 23:37:10 +00:00
committed by Android (Google) Code Review
parent 5149abe73e 3088ff85a5
commit 32c1169ab3
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/app_process/Android.mk
View File

@@ -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) \

2
cmds/app_process/app_main.cpp
View File

@@ -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);