The host build has changed from lib32/lib to lib/lib64.
Use the correct build variable for library dependency.
Change-Id: I2f12d13b595d97b2806eb709613e2cc358f4cad4
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 150b404..39a734d 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -59,7 +59,6 @@
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
@@ -71,7 +70,6 @@
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
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 7a0b468..e467656 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -228,7 +228,7 @@
gtest_exe := $$(HOST_OUT_EXECUTABLES)/$(1)$$($(2)ART_PHONY_TEST_HOST_SUFFIX)
# Dependencies for all host gtests.
gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
- $$($(2)ART_HOST_LIBRARY_PATH)/libjavacore$$(ART_HOST_SHLIB_EXTENSION)
+ $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION)
.PHONY: $$(gtest_rule)