diff options
| author | 2016-04-27 18:24:33 +0000 | |
|---|---|---|
| committer | 2016-04-27 18:24:33 +0000 | |
| commit | 4dd00e93f300a50097c1ec09ca291849830e98dc (patch) | |
| tree | 9449021bb5bae9c4ebfe2cf33f7d2d540ac893cd /cmds | |
| parent | 493576bc5db94068b5a767021a4a5c8b6963c836 (diff) | |
| parent | 6a850b3f11cff546c962fc87ffc961a267973cd4 (diff) | |
Merge "zygote: Remove NativeLoader initialization step"
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/app_process/app_main.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index 3ae9e1204632..fae0400a1212 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -53,7 +53,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ liblog \ libbinder \ - libnativeloader \ libandroid_runtime \ $(app_process_common_shared_libs) \ diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 7590325982f5..2e023825a219 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -21,7 +21,6 @@ #include <cutils/properties.h> #include <cutils/trace.h> #include <android_runtime/AndroidRuntime.h> -#include <nativeloader/native_loader.h> #include <private/android_filesystem_config.h> // for AID_SYSTEM namespace android { @@ -305,7 +304,6 @@ int main(int argc, char* const argv[]) } if (zygote) { - InitializeNativeLoader(); runtime.start("com.android.internal.os.ZygoteInit", args, zygote); } else if (className) { runtime.start("com.android.internal.os.RuntimeInit", args, zygote); |