commit 421087b06b44c66c8b3010ee5ea6c9a54461d38b
author Vladimir Marko <vmarko@google.com> Tue Feb 27 11:00:17 2018 +0000
committer Vladimir Marko <vmarko@google.com> Wed Feb 28 14:26:32 2018 +0000
tree efcbcf49af74d650c7084124bd2d42ecd1e5c42a
parent f70ea622cf22363ca7c2716714c2712faaf50238

Fix oatdump for app with --boot-image and add test.

Test: oatdump_app_test
Bug: 67081292
Change-Id: I2e0bccac4ab866f6b54855f9795b16f2ea30c9bb

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 4a35ccf..524dc05 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -184,6 +184,7 @@
 ART_GTEST_heap_verification_test_DEX_DEPS := ProtoCompare ProtoCompare2 StaticsFromCode XandY
 ART_GTEST_verifier_deps_test_DEX_DEPS := VerifierDeps VerifierDepsMulti MultiDex
 ART_GTEST_dex_to_dex_decompiler_test_DEX_DEPS := VerifierDeps DexToDexDecompiler
+ART_GTEST_oatdump_app_test_DEX_DEPS := ProfileTestMultiDex
 
 # The elf writer test has dependencies on core.oat.
 ART_GTEST_elf_writer_test_HOST_DEPS := $(HOST_CORE_IMAGE_DEFAULT_64) $(HOST_CORE_IMAGE_DEFAULT_32)
@@ -303,6 +304,11 @@
   oatdumpd-target
 ART_GTEST_oatdump_image_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS)
 ART_GTEST_oatdump_image_test_TARGET_DEPS := $(ART_GTEST_oatdump_test_TARGET_DEPS)
+ART_GTEST_oatdump_app_test_HOST_DEPS := $(ART_GTEST_oatdump_test_HOST_DEPS) \
+  dex2oatd-host \
+  dex2oatds-host
+ART_GTEST_oatdump_app_test_TARGET_DEPS := $(ART_GTEST_oatdump_test_TARGET_DEPS) \
+  dex2oatd-target
 
 ART_GTEST_patchoat_test_HOST_DEPS := \
   $(ART_GTEST_dex2oat_environment_tests_HOST_DEPS)