Merge "Fix ASAN builds after app_process change."

2016-02-26 14:45:02 +00:00
parent 38b839ca08 1da1e5cd3b
commit d21b6420d2
2 changed files with 2 additions and 1 deletions
--- 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) \

--- 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 {