From 573895bbea7cf349d615606004cdb85ba2ca814d Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 26 Feb 2016 13:16:50 +0000
Subject: [PATCH] Fix ASAN builds after app_process change.

Bug:27245894

Change-Id: Ie2fc1edcbd874e8ad3b932f8e24ef38c9817b2cd
---
 cmds/app_process/Android.mk   | 1 +
 cmds/app_process/app_main.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400a12129..3ae9e12046329 100644
--- 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 bfcba9aee6143..8bcbf51cc8572 100644
--- 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 {