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/Android.mk b/Android.mk
index 86d29b2..6af4041 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,7 +108,7 @@
ART_HOST_DEPENDENCIES := \
$(ART_HOST_EXECUTABLES) \
$(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \
- $(HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
+ $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
ART_TARGET_DEPENDENCIES := \
$(ART_TARGET_EXECUTABLES) \
$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \
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)
diff --git a/test/Android.oat.mk b/test/Android.oat.mk
index da0ad8d..a560a17 100644
--- a/test/Android.oat.mk
+++ b/test/Android.oat.mk
@@ -163,14 +163,14 @@
# All tests require the host executables, libarttest and the core images.
ART_TEST_HOST_OAT_DEPENDENCIES := \
$(ART_HOST_EXECUTABLES) \
- $(ART_HOST_LIBRARY_PATH)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
- $(ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
+ $(ART_HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
+ $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(HOST_CORE_IMG_OUT)
ifneq ($(HOST_PREFER_32_BIT),true)
ART_TEST_HOST_OAT_DEPENDENCIES += \
- $(2ND_ART_HOST_LIBRARY_PATH)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
- $(2ND_ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
+ $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
+ $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(2ND_HOST_CORE_IMG_OUT)
endif
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 13e967c..25bcf0a 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -109,12 +109,12 @@
# All tests require the host executables and the core images.
ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \
$(ART_HOST_EXECUTABLES) \
- $(ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
+ $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(HOST_CORE_IMG_OUT)
ifneq ($(HOST_PREFER_32_BIT),true)
ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \
- $(2ND_ART_HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
+ $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
$(2ND_HOST_CORE_IMG_OUT)
endif
