diff options
| author | 2023-03-31 15:53:06 +0000 | |
|---|---|---|
| committer | 2023-03-31 15:53:06 +0000 | |
| commit | b05664f90cc9eda0889225c8f414db1ffe6e5685 (patch) | |
| tree | cd50b267cadde3232393864ed048c306cf68c5e2 /java/sdk_library.go | |
| parent | e0033ac0126eae59557c0ab66af22d80150811cc (diff) | |
| parent | 9b9cda6b146c36e69e669faed1510538d4b3f06e (diff) | |
Merge changes I1ed3ab24,I68678ddf am: 2d704998f4 am: 9b9cda6b14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937
Change-Id: I15a0015fa6465708436254fde8efa6ed05446359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 5477ed664..103f1ace7 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1267,7 +1267,10 @@ var implLibraryTag = sdkLibraryComponentTag{name: "impl-library"} func (module *SdkLibrary) ComponentDepsMutator(ctx android.BottomUpMutatorContext) { for _, apiScope := range module.getGeneratedApiScopes(ctx) { // Add dependencies to the stubs library - ctx.AddVariationDependencies(nil, apiScope.stubsTag, module.stubsLibraryModuleName(apiScope)) + stubModuleName := module.stubsLibraryModuleName(apiScope) + // Use JavaApiLibraryName function to be redirected to stubs generated from .txt if applicable + stubModuleName = android.JavaApiLibraryName(ctx.Config(), stubModuleName) + ctx.AddVariationDependencies(nil, apiScope.stubsTag, stubModuleName) // Add a dependency on the stubs source in order to access both stubs source and api information. ctx.AddVariationDependencies(nil, apiScope.stubsSourceAndApiTag, module.stubsSourceModuleName(apiScope)) |