commit 3976a56904e359eb975395725e908122d7d6e466
author David Srbecky <dsrbecky@google.com> Thu May 28 18:37:35 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 28 18:37:37 2015 +0000
tree f1ae89a44eb2c40ed5bd2771fb8b9efbee3f81a1
parent 495ebb119bd1cea64f985367ba3bb87594e4fa81
parent f39477b592e6e17fe41ace2e18602a69b2dd1619

Merge "Replace --include-cfi with --generate-debug-info."

cmds/app_process/Android.mk

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index ce6d7b5..3599695 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -52,11 +52,13 @@
 LOCAL_CPPFLAGS := -std=c++11
 
 LOCAL_MODULE := app_process__asan
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan
-LOCAL_MODULE_STEM := app_process
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := app_process32
+LOCAL_MODULE_STEM_64 := app_process64
+
 LOCAL_ADDRESS_SANITIZER := true
 LOCAL_CLANG := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan
 
 LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code