commit 38b839ca085f62c5ba06336461e3ae96b849a34e
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 26 13:33:51 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 26 13:33:52 2016 +0000
tree b1d1784166b776462c15170d22616f51d03e2870
parent 33e7677665c38507e58245c92101acef01ff302d
parent 204386e1c56930cfbc304c91b9a8b4190567e524

Merge "zygote to preload public native libraries"

cmds/app_process/Android.mk

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index 51bbb81..fae0400 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -20,6 +20,7 @@
     libutils \
     liblog \
     libbinder \
+    libnativeloader \
     libandroid_runtime \
     $(app_process_common_shared_libs) \
 

cmds/app_process/app_main.cpp

diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 2e02382..bfcba9a 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -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 @@
     }
 
     if (zygote) {
+        PreloadPublicNativeLibraries();
         runtime.start("com.android.internal.os.ZygoteInit", args, zygote);
     } else if (className) {
         runtime.start("com.android.internal.os.RuntimeInit", args, zygote);