From 96a6345bd3a82f6e7afec8e1232398098aabc574 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 30 Oct 2014 12:13:17 +0000 Subject: [PATCH] Fix gtest dependencies. Change-Id: I661f3b09e2ed8102ae262104f3784a8eb067a0b2 --- build/Android.gtest.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 639100169..0f9e56a64 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -64,6 +64,7 @@ ART_GTEST_elf_writer_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_default_no-pic_64) ART_GTEST_jni_internal_test_TARGET_DEPS := $(TARGET_CORE_DEX_FILES) ART_GTEST_proxy_test_TARGET_DEPS := $(TARGET_CORE_DEX_FILES) ART_GTEST_proxy_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32) +ART_GTEST_dex_method_iterator_test_TARGET_DEPS := $(TARGET_CORE_JARS) # The path for which all the source files are relative, not actually the current directory. LOCAL_PATH := art @@ -255,7 +256,8 @@ define define-art-gtest-rule-target $$(ART_GTEST_$(1)_TARGET_DEPS) \ $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX)) \ $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \ - $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so + $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ + $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar .PHONY: $$(gtest_rule) $$(gtest_rule): test-art-target-sync -- 2.11.0