From b68f891c8809eab4f48f29367b03f596c518d22d Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Mon, 19 Sep 2016 12:14:46 +0200
Subject: 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 | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'library')

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
+    }
-- 
cgit v1.2.3