commit 975b77427413977665f3be66d02e1d164df1efbc
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 21 17:37:38 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Mar 22 08:30:24 2019 +0000
tree 5f4fea939264fe245d3df9a052d5551736f802fe
parent 340eff4ef043a58934304b33d0656ee3741b2f94

Fix two_runtimes_test dependencies.

Test: two_runtimes_test
Change-Id: I79b34ed0a7bcccdce78a761533155588236bf213

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index ac0ba47..74b7707 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -202,6 +202,8 @@
 ART_GTEST_oat_file_test_DEX_DEPS := Main MultiDex MainUncompressed MultiDexUncompressed MainStripped Nested MultiDexModifiedSecondary
 ART_GTEST_oat_test_DEX_DEPS := Main
 ART_GTEST_oat_writer_test_DEX_DEPS := Main
+# two_runtimes_test build off dex2oat_environment_test, which does sanity checks on the following dex files.
+ART_GTEST_two_runtimes_test_DEX_DEPS := Main MainStripped Nested MultiDex MultiDexModifiedSecondary
 ART_GTEST_object_test_DEX_DEPS := ProtoCompare ProtoCompare2 StaticsFromCode XandY
 ART_GTEST_proxy_test_DEX_DEPS := Interfaces
 ART_GTEST_reflection_test_DEX_DEPS := Main NonStaticLeafMethods StaticLeafMethods
@@ -223,6 +225,10 @@
 ART_GTEST_elf_writer_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
 ART_GTEST_elf_writer_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TARGET_CORE_IMAGE_DEFAULT_32)
 
+# The two_runtimes_test test has dependencies on core.oat.
+ART_GTEST_two_runtimes_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
+ART_GTEST_two_runtimes_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TARGET_CORE_IMAGE_DEFAULT_32)
+
 ART_GTEST_dex2oat_environment_tests_HOST_DEPS := \
   $(HOST_CORE_IMAGE_optimizing_64) \
   $(HOST_CORE_IMAGE_optimizing_32) \