diff options
Diffstat (limited to 'android/testing.go')
-rw-r--r-- | android/testing.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/testing.go b/android/testing.go index acec6fc01..f4f5c98e2 100644 --- a/android/testing.go +++ b/android/testing.go @@ -558,7 +558,7 @@ func (p TestingBuildParams) RelativeToTop() TestingBuildParams { return p } if p.config.config == nil { - panic("cannot call RelativeToTop() on a TestingBuildParams previously returned by RelativeToTop()") + return p } // Take a copy of the build params and replace any args that contains test specific temporary // paths with paths relative to the top. @@ -670,7 +670,7 @@ func (b baseTestingComponent) newTestingBuildParams(bparams BuildParams) Testing config: b.config, BuildParams: bparams, RuleParams: b.provider.RuleParamsForTests()[bparams.Rule], - } + }.RelativeToTop() } func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuildParams, []string) { |