diff options
| author | Richard Uhler <ruhler@google.com> | 2015-05-14 13:21:13 -0700 |
|---|---|---|
| committer | Richard Uhler <ruhler@google.com> | 2015-05-18 08:03:15 -0700 |
| commit | a5a1c13a74225a1db3c54dc108fcd161b867bb00 (patch) | |
| tree | b43e46d05a7f2af48e5401eb52a7d80e821826eb /build | |
| parent | 3b0ee6f06b6643e2a601283e779ba5d574fe1fda (diff) | |
| download | art-a5a1c13a74225a1db3c54dc108fcd161b867bb00.zip art-a5a1c13a74225a1db3c54dc108fcd161b867bb00.tar.gz art-a5a1c13a74225a1db3c54dc108fcd161b867bb00.tar.bz2 | |
Test and fix bug checking status of secondary multidex files.
We were accidentally returning 'false' instead of 'true' to indicate a native
multidex file with an up-to-date primary dex file checksum but out-of-date
secondary dex file checksum is out of date.
Bug: 21022815
Change-Id: I43d360ca9251d0df38ad7f8289f6ef339c0a3280
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.gtest.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 730e61d..5d4f1d3 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -30,6 +30,7 @@ GTEST_DEX_DIRECTORIES := \ Interfaces \ Main \ MultiDex \ + MultiDexModifiedSecondary \ MyClass \ MyClassNatives \ Nested \ @@ -68,7 +69,7 @@ ART_GTEST_exception_test_DEX_DEPS := ExceptionHandle ART_GTEST_instrumentation_test_DEX_DEPS := Instrumentation ART_GTEST_jni_compiler_test_DEX_DEPS := MyClassNatives ART_GTEST_jni_internal_test_DEX_DEPS := AllFields StaticLeafMethods -ART_GTEST_oat_file_assistant_test_DEX_DEPS := Main MainStripped MultiDex Nested +ART_GTEST_oat_file_assistant_test_DEX_DEPS := Main MainStripped MultiDex MultiDexModifiedSecondary Nested ART_GTEST_oat_file_test_DEX_DEPS := Main MultiDex ART_GTEST_object_test_DEX_DEPS := ProtoCompare ProtoCompare2 StaticsFromCode XandY ART_GTEST_proxy_test_DEX_DEPS := Interfaces |