diff options
| author | 2016-04-27 18:33:56 +0000 | |
|---|---|---|
| committer | 2016-04-27 18:33:56 +0000 | |
| commit | 059803834169ec52f06e5a980d87c3d73abcfd14 (patch) | |
| tree | c5b73d7a837f765094ea4279e3cea1329a72d37d /cmds | |
| parent | fa8b96c6c154e6fd85c2411d516f451273db6ad6 (diff) | |
| parent | 4dd00e93f300a50097c1ec09ca291849830e98dc (diff) | |
Merge "zygote: Remove NativeLoader initialization step"
am: 4dd00e9
* commit '4dd00e93f300a50097c1ec09ca291849830e98dc':
zygote: Remove NativeLoader initialization step
Change-Id: I5ea672ea9e58720d37e29a9407e7c963b5cf65dd
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); |