summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2016-09-19 12:14:46 +0200
committerYohann Roussel <yroussel@google.com>2017-05-30 12:20:54 +0200
commitb68f891c8809eab4f48f29367b03f596c518d22d (patch)
treecfdbe6214ea57fa815b4dc4a42bbea8c1e50f70e
parent031b913e179be86385afabebd0d583d8ce8e4a47 (diff)
downloadmultidex-b68f891c8809eab4f48f29367b03f596c518d22d.tar.gz
Keep InstrumentationTestCase in main dex
They must be in main dex or InstrumentationTestRunner won't find them. Bug: 31383194 Test: frameworks/base/core/tests/hosttests/test-apps/MultiDex* Change-Id: I76ea9e9f46fa95f6a1f2d35410480be42f7a5151
-rw-r--r--library/jack-meta/legacyMultidexInstallation.jpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/library/jack-meta/legacyMultidexInstallation.jpp b/library/jack-meta/legacyMultidexInstallation.jpp
index 8a81eba..a5a7167 100644
--- a/library/jack-meta/legacyMultidexInstallation.jpp
+++ b/library/jack-meta/legacyMultidexInstallation.jpp
@@ -47,3 +47,10 @@ multidexInstaller:
method void attachBaseContext(class android.content.Context)
;
}
+
+instrumentationTestCase:
+ @@com.android.jack.annotations.ForceInMainDex
+ class *
+ extends {
+ class android.test.InstrumentationTestCase
+ }