diff options
| author | Richard Uhler <ruhler@google.com> | 2015-05-18 15:18:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-18 15:18:56 +0000 |
| commit | ce70082da8a4e63c280c2f049a67b38acc82ee1a (patch) | |
| tree | e8f0f86b7b138fa44f16fb2fc3245acd94a93663 /build | |
| parent | 6650075fb831379d24cfafc3d56442e742418688 (diff) | |
| parent | a5a1c13a74225a1db3c54dc108fcd161b867bb00 (diff) | |
| download | art-ce70082da8a4e63c280c2f049a67b38acc82ee1a.zip art-ce70082da8a4e63c280c2f049a67b38acc82ee1a.tar.gz art-ce70082da8a4e63c280c2f049a67b38acc82ee1a.tar.bz2 | |
Merge "Test and fix bug checking status of secondary multidex files." into mnc-dev
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 |