commit 665de8a1710d2418f60d3bffdc99bdac32252530
author Ian Rogers <irogers@google.com> Tue Jun 24 21:34:09 2014 -0700
committer Ian Rogers <irogers@google.com> Tue Jun 24 21:34:09 2014 -0700
tree ebd3fde6e4015a1a13f5dfa13fdd4be144d65346
parent d377971c505e8cfacc878b8c632cc40fcf7d88c5

Fix various test dependencies.

Change-Id: I2e4761f4cc061f74319a7b64ebe67c553d5297df

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 4023336..150b404 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -48,6 +48,8 @@
   ART_TARGET_ARCH_64 :=
 endif
 
+ART_HOST_SHLIB_EXTENSION := $(HOST_SHLIB_SUFFIX)
+ART_HOST_SHLIB_EXTENSION ?= .so
 ifeq ($(HOST_PREFER_32_BIT),true)
   ART_PHONY_TEST_HOST_SUFFIX := 32
   2ND_ART_PHONY_TEST_HOST_SUFFIX :=
@@ -56,6 +58,8 @@
   ART_HOST_ARCH := x86
   2ND_ART_HOST_ARCH :=
   2ND_HOST_ARCH :=
+  ART_HOST_LIBRARY_PATH := $(HOST_LIBRARY_PATH)
+  2ND_ART_HOST_LIBRARY_PATH :=
   ART_HOST_OUT_SHARED_LIBRARIES := $(2ND_HOST_OUT_SHARED_LIBRARIES)
   2ND_ART_HOST_OUT_SHARED_LIBRARIES :=
 else
@@ -66,6 +70,8 @@
   ART_HOST_ARCH := x86_64
   2ND_ART_HOST_ARCH := x86
   2ND_HOST_ARCH := x86
+  ART_HOST_LIBRARY_PATH := $(HOST_LIBRARY_PATH)
+  2ND_ART_HOST_LIBRARY_PATH := $(HOST_LIBRARY_PATH)32
   ART_HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT_SHARED_LIBRARIES)
   2ND_ART_HOST_OUT_SHARED_LIBRARIES := $(2ND_HOST_OUT_SHARED_LIBRARIES)
 endif