diff options
| author | 2021-09-24 09:32:24 +0000 | |
|---|---|---|
| committer | 2021-09-24 09:32:24 +0000 | |
| commit | cf6bf37d0448919e752c3068a4c47adde42dc7f8 (patch) | |
| tree | 72f81e463e1992b304c06aaf7adba43e0b54fff1 /sdk/java_sdk_test.go | |
| parent | e1bb74e72445557e4dbdcc321072f15a45b5e005 (diff) | |
| parent | 4482560cc73f16f09eecda42751cf2f8dc72e7de (diff) | |
Merge changes I957f3df8,I68986dcc
* changes:
Consolidate the code to resolve a deapexer module dependency.
Propagate the dex jar path as an OptionalPath which is either valid or invalid with a message.
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 43542cbdc..2b537398a 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -1307,7 +1307,7 @@ java_sdk_library_import { ctx := android.ModuleInstallPathContextForTesting(result.Config) dexJarBuildPath := func(name string, kind android.SdkKind) string { dep := result.Module(name, "android_common").(java.SdkLibraryDependency) - path := dep.SdkApiStubDexJar(ctx, kind) + path := dep.SdkApiStubDexJar(ctx, kind).Path() return path.RelativeToTop().String() } |