diff options
| author | 2021-03-11 17:17:29 +0000 | |
|---|---|---|
| committer | 2021-03-11 17:17:29 +0000 | |
| commit | 4cd3d05a0c269598adba1c9ef6657e7d4d8c914a (patch) | |
| tree | db88eb3cb8dcd68d1a0da3280490bde11e0fb4b1 /sdk/java_sdk_test.go | |
| parent | fc9c218e830789ed7c9845356d83721506c72030 (diff) | |
| parent | 8306f25679746fd00ae2739b62fa1f70dae5a52e (diff) | |
Merge "Make testSdkResult compatible with android.TestResult"
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 111b22c68..f6d508d23 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -125,7 +125,7 @@ func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { `) // Make sure that the mysdk module depends on "sdkmember" and not "prebuilt_sdkmember". - java.CheckModuleDependencies(t, result.ctx, "mysdk", "android_common", []string{"sdkmember"}) + java.CheckModuleDependencies(t, result.TestContext, "mysdk", "android_common", []string{"sdkmember"}) result.CheckSnapshot("mysdk", "", checkAndroidBpContents(`// This is auto-generated. DO NOT EDIT. @@ -224,11 +224,11 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { } `) - sdkMemberV1 := result.ctx.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output - sdkMemberV2 := result.ctx.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output + sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output + sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output - javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1") - javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2") + javalibForMyApex := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1") + javalibForMyApex2 := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2") // Depending on the uses_sdks value, different libs are linked ensureListContains(t, pathsToStrings(javalibForMyApex.Rule("javac").Implicits), sdkMemberV1.String()) |