From 1efdb3018274d1e101b9091884377f1d59a866fb Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Sun, 14 Mar 2021 00:04:51 +0000 Subject: Remove javaMockFS() Also, removes the workaround that allowed preparers to override files added in javaMockFS(). The performance of the java tests was determined by running: m nothing rm -fr out/soong/.bootstrap/soong-java/test/ time m nothing Prior to starting this work that returned: real 1m30.060s user 33m3.028s sys 13m25.413s Immediately prior to this change that returned: real 1m2.777s user 14m14.352s sys 9m40.745s After applying this change that returned: real 0m20.282s user 3m7.429s sys 0m43.601s So, this reduced the real time cost of running the java tests from 90 seconds to 20 seconds. Bug: 182638834 Test: m nothing Change-Id: I30490fd40ddb0684a5a4975ce1811bab5dc79e4e --- java/java_test.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 2cc66169b..f4b8c9f65 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -64,8 +64,6 @@ var javaFixtureFactory = android.NewFixtureFactory( ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), - javaMockFS().AddToFixture(), - PrepareForTestWithJavaSdkLibraryFiles, dexpreopt.PrepareForTestWithDexpreopt, ) -- cgit v1.2.3-59-g8ed1b