StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add emptyFixtureFactory in java package" am: 93b61b49dd am: f2dec10262

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642105

Change-Id: Ice08a34e362e1d50ae953a3f68a3db31e2398522
This commit is contained in:
Paul Duffin
2021-03-18 09:13:20 +00:00
committed by Automerger Merge Worker
parent ef3ada76c4 f2dec10262
commit 22ec063dff
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java_test.go
View File

@@ -48,9 +48,10 @@ func tearDown() {
os.RemoveAll(buildDir) os.RemoveAll(buildDir)
} }
var emptyFixtureFactory = android.NewFixtureFactory(&buildDir)
// Factory to use to create fixtures for tests in this package. // Factory to use to create fixtures for tests in this package.
var javaFixtureFactory = android.NewFixtureFactory( var javaFixtureFactory = emptyFixtureFactory.Extend(
&buildDir,
genrule.PrepareForTestWithGenRuleBuildComponents, genrule.PrepareForTestWithGenRuleBuildComponents,
// Get the CC build components but not default modules. // Get the CC build components but not default modules.
cc.PrepareForTestWithCcBuildComponents, cc.PrepareForTestWithCcBuildComponents,