commit dc781a13ddb4dabf646bb45d0c53b65cab948e5b
author Colin Cross <ccross@android.com> Tue Feb 04 16:22:03 2014 -0800
committer Colin Cross <ccross@android.com> Tue Feb 18 17:22:15 2014 -0800
tree b74e4a579747ce12297b5a66f04669f42dfffa6a
parent 89925e948c49616689eb4959aaf0e4ff1de18161

art: convert makefiles to support multilib build

Convert makefiles to allow for building two architectures at the
same time.  More changes may be necessary to get the tests to
build.

Change-Id: I02ba11706b7e5b5592d76e43c167bcbf0e665b93

build/Android.libarttest.mk

diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 65b78c9..d807a9c 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -48,9 +48,11 @@
   ifeq ($$(art_target_or_host),target)
     LOCAL_CLANG := $(ART_TARGET_CLANG)
     LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
+    LOCAL_CFLAGS_x86 := $(ART_TARGET_CFLAGS_x86)
     LOCAL_SHARED_LIBRARIES += libdl libcutils
     LOCAL_STATIC_LIBRARIES := libgtest
     LOCAL_MODULE_PATH := $(ART_TEST_OUT)
+    LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH)
     include $(BUILD_SHARED_LIBRARY)
   else # host
     LOCAL_CLANG := $(ART_HOST_CLANG)