diff options
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r-- | apex/apex_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 2a2a1f45f..1f9bd5a2e 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4799,9 +4799,10 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { transform := android.NullFixturePreparer checkDexJarBuildPath := func(t *testing.T, ctx *android.TestContext, name string) { + t.Helper() // Make sure the import has been given the correct path to the dex jar. p := ctx.ModuleForTests(name, "android_common_myapex").Module().(java.UsesLibraryDependency) - dexJarBuildPath := p.DexJarBuildPath() + dexJarBuildPath := p.DexJarBuildPath().PathOrNil() stem := android.RemoveOptionalPrebuiltPrefix(name) android.AssertStringEquals(t, "DexJarBuildPath should be apex-related path.", ".intermediates/myapex.deapexer/android_common/deapexer/javalib/"+stem+".jar", @@ -4809,6 +4810,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { } checkDexJarInstallPath := func(t *testing.T, ctx *android.TestContext, name string) { + t.Helper() // Make sure the import has been given the correct path to the dex jar. p := ctx.ModuleForTests(name, "android_common_myapex").Module().(java.UsesLibraryDependency) dexJarBuildPath := p.DexJarInstallPath() @@ -4819,6 +4821,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { } ensureNoSourceVariant := func(t *testing.T, ctx *android.TestContext, name string) { + t.Helper() // Make sure that an apex variant is not created for the source module. android.AssertArrayString(t, "Check if there is no source variant", []string{"android_common"}, |