Fix ASAN builds after app_process change.

Bug:27245894

Change-Id: Ie2fc1edcbd874e8ad3b932f8e24ef38c9817b2cd

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400..3ae9e12 100644 (file)
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -53,6 +53,7 @@ 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 bfcba9a..8bcbf51 100644 (file)
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -20,8 +20,8 @@
 #include <cutils/process_name.h>
 #include <cutils/properties.h>
 #include <cutils/trace.h>
-#include <nativeloader/native_loader.h>
 #include <android_runtime/AndroidRuntime.h>
+#include <nativeloader/native_loader.h>
 #include <private/android_filesystem_config.h>  // for AID_SYSTEM
 
 namespace android {