From 8306f25679746fd00ae2739b62fa1f70dae5a52e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 11 Mar 2021 12:18:24 +0000 Subject: Make testSdkResult compatible with android.TestResult This change makes it easier to switch the sdk package over to using the new fixture mechanism by removing inconsistencies between the testSdkResult and TestResult structures. Bug: 181070625 Test: m nothing Change-Id: Ic4c06e08ea5060fd09123f2ca65580e18b4d2ef6 --- sdk/java_sdk_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sdk/java_sdk_test.go') 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()) -- cgit v1.2.3-59-g8ed1b