commit b68f891c8809eab4f48f29367b03f596c518d22d
author Yohann Roussel <yroussel@google.com> Mon Sep 19 12:14:46 2016 +0200
committer Yohann Roussel <yroussel@google.com> Tue May 30 12:20:54 2017 +0200
tree cfdbe6214ea57fa815b4dc4a42bbea8c1e50f70e
parent 031b913e179be86385afabebd0d583d8ce8e4a47

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

library/jack-meta/legacyMultidexInstallation.jpp

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 @@
       method void attachBaseContext(class android.content.Context)
       ;
     }
+
+instrumentationTestCase:
+  @@com.android.jack.annotations.ForceInMainDex
+  class *
+    extends {
+      class android.test.InstrumentationTestCase
+    }