commit 4f34f8b1062daea3e17a3298bd46fa35a8211fed
author Nicolas Geoffray <ngeoffray@google.com> Thu Oct 30 12:17:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 30 12:17:31 2014 +0000
tree cc30e4fe5ac041652451dfc04ba95d39d66101da
parent 8d86d6d9bb87d82e29b1b89c9d8d9c2b4b23c265
parent d59fae7c0bb8fd69397c5d987bcc439cdc0019cd

am d59fae7c: Merge "Fix gtest dependencies."

* commit 'd59fae7c0bb8fd69397c5d987bcc439cdc0019cd':
  Fix gtest dependencies.

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 6391001..0f9e56a 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -64,6 +64,7 @@
 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 @@
     $$(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