Remove extra return value from testApex
The config value returned by testApex is no longer used, remove it. Test: go test ./apex Change-Id: I9327c1b139c17305454fb0a111e41456cdcaebc3
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func TestVndkApexForVndkLite(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
ctx := testApex(t, `
|
||||
apex_vndk {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
@@ -98,7 +98,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
}
|
||||
|
||||
t.Run("VNDK lib doesn't have an apex variant", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, bp)
|
||||
ctx := testApex(t, bp)
|
||||
|
||||
// libfoo doesn't have apex variants
|
||||
for _, variant := range ctx.ModuleVariantsForTests("libfoo") {
|
||||
@@ -111,7 +111,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("VNDK APEX gathers only vendor variants even if product variants are available", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
||||
ctx := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
||||
// Now product variant is available
|
||||
config.TestProductVariables.ProductVndkVersion = proptools.StringPtr("current")
|
||||
})
|
||||
@@ -121,7 +121,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("VNDK APEX supports coverage variants", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
||||
ctx := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
||||
config.TestProductVariables.GcovCoverage = proptools.BoolPtr(true)
|
||||
config.TestProductVariables.Native_coverage = proptools.BoolPtr(true)
|
||||
})
|
||||
|
Reference in New Issue
Block a user