commit d00e02b7614e8edc2e1fd8426ec249747881ccee
author Mathieu Chartier <mathieuc@google.com> Wed May 24 12:04:13 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Sun May 28 17:59:07 2017 -0700
tree eefbab768f128bdde43d2396f02e3e1fcf2039d3
parent 0a5ace58e973da278049f837bf2cdbaf7b44849c

Fix dexlayout fixed point test

Previously, the dex location did not match the one in the profile.
This caused the second dexlayout to not match the checksum and not
use the profile.

Also added a generic function to generate a profile based on an input
dex.

Test: test-art-host

Bug: 62040831

Change-Id: I2b4fb383ec7a46b158f763de13ecbcd8a8c6180d

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 0a465c4..bcf48fd 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -40,6 +40,7 @@
   Interfaces \
   Lookup \
   Main \
+  ManyMethods \
   MethodTypes \
   MultiDex \
   MultiDexModifiedSecondary \
@@ -103,6 +104,7 @@
 ART_GTEST_compiler_driver_test_DEX_DEPS := AbstractMethod StaticLeafMethods ProfileTestMultiDex
 ART_GTEST_dex_cache_test_DEX_DEPS := Main Packages MethodTypes
 ART_GTEST_dex_file_test_DEX_DEPS := GetMethodSignature Main Nested MultiDex
+ART_GTEST_dexlayout_test_DEX_DEPS := ManyMethods
 ART_GTEST_dex2oat_test_DEX_DEPS := $(ART_GTEST_dex2oat_environment_tests_DEX_DEPS) Statics VerifierDeps
 ART_GTEST_exception_test_DEX_DEPS := ExceptionHandle
 ART_GTEST_image_test_DEX_DEPS := ImageLayoutA ImageLayoutB DefaultMethods