Merge "Extract prepareForCcTest" am: d11d199ba6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655213 Change-Id: I16a5fd04cedaa91b98b82c3450a39d80070a64a2
This commit is contained in:
@@ -54,6 +54,10 @@ func TestMain(m *testing.M) {
|
|||||||
|
|
||||||
var ccFixtureFactory = android.NewFixtureFactory(
|
var ccFixtureFactory = android.NewFixtureFactory(
|
||||||
&buildDir,
|
&buildDir,
|
||||||
|
prepareForCcTest,
|
||||||
|
)
|
||||||
|
|
||||||
|
var prepareForCcTest = android.GroupFixturePreparers(
|
||||||
PrepareForTestWithCcIncludeVndk,
|
PrepareForTestWithCcIncludeVndk,
|
||||||
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
|
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
|
||||||
variables.DeviceVndkVersion = StringPtr("current")
|
variables.DeviceVndkVersion = StringPtr("current")
|
||||||
|
Reference in New Issue
Block a user