commit ea552bcca3ba6954b079fd246ae0a13557ea1c9e
author android-build-team Robot <android-build-team-robot@google.com> Mon Apr 12 23:38:58 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Apr 12 23:38:58 2021 +0000
tree 521076456bd74801a069a72cc65e4b3341610ece
parent 40e8eb8266126d7883edb12778efb901fcd4894c
parent c802c3713270b363240dc48409a66c5c35601281

Merge cherrypicks of [14163682, 14163683, 14164173, 14163919, 14161517, 14161321, 14164586, 14163920, 14161700] into rvc-qpr3-release

Change-Id: Ib506f255b839b429ef097fb03cb050bad93fac63

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 95d0f38..1b2180e 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -261,6 +261,10 @@
 ART_GTEST_transaction_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
 ART_GTEST_transaction_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_DEFAULT_64) $(TARGET_CORE_IMAGE_DEFAULT_32)
 
+# The dex2oat_vdex_test test has dependencies on core.oat.
+ART_GTEST_dex2oat_vdex_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
+ART_GTEST_dex2oat_vdex_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) \