summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Evgenii Stepanov <eugenis@google.com> 2015-05-28 21:30:56 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-05-28 21:30:58 +0000
commitbf7fe1e051fefc5e6c1b96411a842b0305a9192c (patch)
treecbc0b55a72e85e9ba6179fdbe7c2bf67acd0a640
parent0e591ef26ae060bf1d47ffdd02b23b5da416fad7 (diff)
parent5ca3afa296cdfd2a5a1086b69d09e5035969b05c (diff)
Merge "Update asan/app_process." into mnc-dev
-rw-r--r--cmds/app_process/Android.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index ce6d7b518349..359969539691 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -52,11 +52,13 @@ LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -W
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