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

Commit 67d485e9 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove uses of buildDir from java/dexpreopt_bootjars_test.go 

Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: I852dbb5ad2e1aa58df103679c5e9de14cf64abc3
parent c029c43c

java/dexpreopt_bootjars_test.go

+5 −5
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu 
	rule := dexpreoptBootJars.Output(ruleFile)



	for i := range expectedInputs {

		expectedInputs[i] = filepath.Join(buildDir, "test_device", expectedInputs[i])

		expectedInputs[i] = filepath.Join("out/soong/test_device", expectedInputs[i])

	}



	for i := range expectedOutputs {

		expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i])

		expectedOutputs[i] = filepath.Join("out/soong/test_device", expectedOutputs[i])

	}



	inputs := rule.Implicits.Strings()
@@ -69,9 +69,9 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu 
	sort.Strings(outputs)

	sort.Strings(expectedOutputs)



	android.AssertDeepEquals(t, "inputs", expectedInputs, inputs)

	android.AssertStringPathsRelativeToTopEquals(t, "inputs", result.Config, expectedInputs, inputs)



	android.AssertDeepEquals(t, "outputs", expectedOutputs, outputs)

	android.AssertStringPathsRelativeToTopEquals(t, "outputs", result.Config, expectedOutputs, outputs)

}



func TestDexpreoptBootJars(t *testing.T) {
@@ -107,7 +107,7 @@ func TestDexpreoptBootJars(t *testing.T) { 
func TestDexpreoptBootZip(t *testing.T) {

	ruleFile := "boot.zip"



	ctx := android.PathContextForTesting(testConfig(nil, "", nil))

	ctx := android.PathContextForTesting(android.TestArchConfig("", nil, "", nil))

	expectedInputs := []string{}

	for _, target := range ctx.Config().Targets[android.Android] {

		for _, ext := range []string{".art", ".oat", ".vdex"} {