commit 13eed3cb064308d4b534d921a30cad29e7479575
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu May 03 18:51:07 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 03 18:51:07 2018 -0700
tree 074909c1fe2f934436a36dbdb372411f657073ec
parent 3962813cd90ad452601a21fa1e20d4fef9bd7b0b
parent 472b0bd37da8dc31e0fd6ea95fb67cb800899803

Merge "64 bit stressapptest" am: c1551718dc
am: 472b0bd37d

Change-Id: Ie357743b1f3ce1ffcf806d830b760a4580c22fa2

Android.mk

diff --git a/Android.mk b/Android.mk
index f3cd77d..6698cd0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,11 +18,9 @@
 	src/sat_factory.cc \
 	src/worker.cc
 
-# just build a 32b version, even on 64b hosts
-LOCAL_MULTILIB := 32
 LOCAL_MODULE := stressapptest
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips x86
+LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips x86 x86_64
 
 LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS
 LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-\#warnings