From a71a67a4f5b6e5cdaa1dea65465770412fd9e25d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 29 Mar 2021 00:42:57 +0100 Subject: Remove extraneous calls to TestingBuildParams.RelativeToTop() Deprecated the method to try and prevent any other uses being added. Bug: 183650682 Test: m nothing Change-Id: Ia6f43851e5a00c9d96af780e3bd21e03175e1a2f --- java/sdk_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/sdk_test.go') diff --git a/java/sdk_test.go b/java/sdk_test.go index 028c4fe9a..e1ec41bdc 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -313,10 +313,10 @@ func TestClasspath(t *testing.T) { checkClasspath := func(t *testing.T, result *android.TestResult, isJava8 bool) { foo := result.ModuleForTests("foo", variant) - javac := foo.Rule("javac").RelativeToTop() + javac := foo.Rule("javac") var deps []string - aidl := foo.MaybeRule("aidl").RelativeToTop() + aidl := foo.MaybeRule("aidl") if aidl.Rule != nil { deps = append(deps, android.PathRelativeToTop(aidl.Output)) } @@ -376,7 +376,7 @@ func TestClasspath(t *testing.T) { checkClasspath(t, result, true /* isJava8 */) if testcase.host != android.Host { - aidl := result.ModuleForTests("foo", variant).Rule("aidl").RelativeToTop() + aidl := result.ModuleForTests("foo", variant).Rule("aidl") android.AssertStringDoesContain(t, "aidl command", aidl.RuleParams.Command, testcase.aidl+" -I.") } @@ -389,7 +389,7 @@ func TestClasspath(t *testing.T) { checkClasspath(t, result, false /* isJava8 */) if testcase.host != android.Host { - aidl := result.ModuleForTests("foo", variant).Rule("aidl").RelativeToTop() + aidl := result.ModuleForTests("foo", variant).Rule("aidl") android.AssertStringDoesContain(t, "aidl command", aidl.RuleParams.Command, testcase.aidl+" -I.") } -- cgit v1.2.3-59-g8ed1b