commit f7bd85959c9ab68b40c8292e514bb622bcb2bb21
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 26 14:46:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 26 14:46:53 2016 +0000
tree 6f701065fc6955c826d0f7f75ab847a8c06e976b
parent 9ba5c7f13e9b883e51322a6f067358dd011d244a
parent d21b6420d2a321168547bee8885b50e598823255

Merge "Fix ASAN builds after app_process change."
am: d21b6420d2

* commit 'd21b6420d2a321168547bee8885b50e598823255':
  Fix ASAN builds after app_process change.

cmds/app_process/Android.mk

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400..3ae9e12 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -53,6 +53,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 bfcba9a..8bcbf51 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 {