From 5ec5409a643eff64fad7acf02a59d4d01d0d968e Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 9 Apr 2019 11:58:46 +0100
Subject: [PATCH] Preload android.test.base to improve startup performance

Bug: 73711752
Test: make droid && flashall
Merged-In: I28ac1544c20bc3e8abb4341aa331c212f16301f0
Change-Id: I28ac1544c20bc3e8abb4341aa331c212f16301f0
(cherry picked from commit 0c570794273362f5c03b0a4009708e1c83a316e7)
---
 core/java/com/android/internal/os/ZygoteInit.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index c2b13c9710201..2e32730a6ecb5 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -376,11 +376,17 @@ public class ZygoteInit {
                 null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/);
         hidlManager.addDependency(hidlBase);
 
+        SharedLibraryInfo androidTestBase = new SharedLibraryInfo(
+                "/system/framework/android.test.base.jar", null /*packageName*/,
+                null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN,
+                null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/);
+
         ApplicationLoaders.getDefault().createAndCacheNonBootclasspathSystemClassLoaders(
                 new SharedLibraryInfo[]{
                     // ordered dependencies first
                     hidlBase,
                     hidlManager,
+                    androidTestBase,
                 });
     }