summaryrefslogtreecommitdiff
path: root/cmds/app_process
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2016-02-26 13:16:50 +0000
committerNicolas Geoffray <ngeoffray@google.com>2016-02-26 13:36:20 +0000
commit1da1e5cd3b12e8e56a0ccdd891abf2a1167490bc (patch)
tree146bd41d23064297c3c4df638952ffda40be6890 /cmds/app_process
parent38b839ca085f62c5ba06336461e3ae96b849a34e (diff)
Fix ASAN builds after app_process change.
Bug:27245894 (cherry picked from commit 573895bbea7cf349d615606004cdb85ba2ca814d) Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc
Diffstat (limited to 'cmds/app_process')
-rw-r--r--cmds/app_process/Android.mk1
-rw-r--r--cmds/app_process/app_main.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400a1212..3ae9e1204632 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 bfcba9aee614..8bcbf51cc857 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 {