Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1efdb301 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 3d9f2684

java/java_test.go

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ var javaFixtureFactory = android.NewFixtureFactory( 
		ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory)

		ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory)

	}),

	javaMockFS().AddToFixture(),

	PrepareForTestWithJavaSdkLibraryFiles,

	dexpreopt.PrepareForTestWithDexpreopt,

)

java/testing.go

+3 −41
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import ( 
	"android/soong/android"

	"android/soong/cc"

	"android/soong/dexpreopt"

	"android/soong/python"



	"github.com/google/blueprint"

)
@@ -62,9 +60,7 @@ var PrepareForIntegrationTestWithJava = android.GroupFixturePreparers( 
)



// Prepare a fixture with the standard files required by a java_sdk_library module.

var PrepareForTestWithJavaSdkLibraryFiles = android.FixtureMergeMockFs(javaSdkLibraryFiles)



var javaSdkLibraryFiles = android.MockFS{

var PrepareForTestWithJavaSdkLibraryFiles = android.FixtureMergeMockFs(android.MockFS{

	"api/current.txt":               nil,

	"api/removed.txt":               nil,

	"api/system-current.txt":        nil,
@@ -75,7 +71,7 @@ var javaSdkLibraryFiles = android.MockFS{ 
	"api/module-lib-removed.txt":    nil,

	"api/system-server-current.txt": nil,

	"api/system-server-removed.txt": nil,

}

})



// FixtureWithLastReleaseApis creates a preparer that creates prebuilt versions of the specified

// modules for the `last` API release. By `last` it just means last in the list of supplied versions
@@ -127,49 +123,15 @@ func FixtureWithPrebuiltApis(release2Modules map[string][]string) android.Fixtur 
		mockFS.Merge(prebuiltApisFilesForLibs([]string{release}, libs))

	}

	return android.GroupFixturePreparers(

		// A temporary measure to discard the definitions provided by default by javaMockFS() to allow

		// the changes that use this preparer to fix tests to be separated from the change to remove

		// javaMockFS().

		android.FixtureModifyMockFS(func(fs android.MockFS) {

			for k, _ := range fs {

				if strings.HasPrefix(k, "prebuilts/sdk/") {

					delete(fs, k)

				}

			}

		}),

		android.FixtureAddTextFile(path, bp),

		android.FixtureMergeMockFs(mockFS),

	)

}



func javaMockFS() android.MockFS {

	mockFS := android.MockFS{

		"prebuilts/sdk/tools/core-lambda-stubs.jar": nil,

		"prebuilts/sdk/Android.bp":                  []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"], imports_sdk_version: "none", imports_compile_dex:true,}`),



		"bin.py": nil,

		python.StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%'

		MAIN_FILE = '%main%'`),

	}



	levels := []string{"14", "28", "29", "30", "current"}

	libs := []string{

		"android", "foo", "bar", "sdklib", "barney", "betty", "foo-shared_library",

		"foo-no_shared_library", "core-for-system-modules", "quuz", "qux", "fred",

		"runtime-library",

	}

	for k, v := range prebuiltApisFilesForLibs(levels, libs) {

		mockFS[k] = v

	}



	return mockFS

}



func TestConfig(buildDir string, env map[string]string, bp string, fs map[string][]byte) android.Config {

	bp += GatherRequiredDepsForTest()



	mockFS := javaMockFS()

	mockFS.Merge(javaSdkLibraryFiles)

	mockFS := android.MockFS{}



	cc.GatherRequiredFilesForTest(mockFS)