Merge "Extract prepareForCcTest" am: d11d199ba6 am: 3b56761441 am: 0dcfdfd118

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

Change-Id: I7f0bc0e5600ff5dbe95319fa1c2f74c592398c66
This commit is contained in:
Paul Duffin
2021-03-31 16:27:16 +00:00
committed by Automerger Merge Worker

View File

@@ -54,6 +54,10 @@ func TestMain(m *testing.M) {
var ccFixtureFactory = android.NewFixtureFactory(
&buildDir,
prepareForCcTest,
)
var prepareForCcTest = android.GroupFixturePreparers(
PrepareForTestWithCcIncludeVndk,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.DeviceVndkVersion = StringPtr("current")