StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I1ed3ab24,I68678ddf am: 2d704998f4 am: 9b9cda6b14

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2023-03-31 15:53:06 +00:00
committed by Automerger Merge Worker
parent e0033ac012 9b9cda6b14
commit b05664f90c
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/sdk_version.go
View File

@@ -87,13 +87,13 @@ func (k SdkKind) String() string {
// JavaLibraryName returns the soong module containing the Java APIs of that API surface. // JavaLibraryName returns the soong module containing the Java APIs of that API surface.
func (k SdkKind) JavaLibraryName(c Config) string { func (k SdkKind) JavaLibraryName(c Config) string {
name := k.defaultJavaLibraryName() name := k.defaultJavaLibraryName()
return JavaLibraryNameFromText(c, name) return JavaApiLibraryName(c, name)
} }
// JavaLibraryNameFromText returns the name of .txt equivalent of a java_library, but does // JavaApiLibraryName returns the name of .txt equivalent of a java_library, but does
// not check if either module exists. // not check if either module exists.
// TODO: Return .txt (single-tree or multi-tree equivalents) based on config // TODO: Return .txt (single-tree or multi-tree equivalents) based on config
func JavaLibraryNameFromText(c Config, name string) string { func JavaApiLibraryName(c Config, name string) string {
if c.BuildFromTextStub() { if c.BuildFromTextStub() {
return name + ".from-text" return name + ".from-text"
} }

2
java/bootclasspath_fragment.go
View File

@@ -499,6 +499,8 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon
for _, apiScope := range hiddenAPISdkLibrarySupportedScopes { for _, apiScope := range hiddenAPISdkLibrarySupportedScopes {
// Add a dependency onto a possibly scope specific stub library. // Add a dependency onto a possibly scope specific stub library.
scopeSpecificDependency := apiScope.scopeSpecificStubModule(ctx, additionalStubModule) scopeSpecificDependency := apiScope.scopeSpecificStubModule(ctx, additionalStubModule)
// Use JavaApiLibraryName function to be redirected to stubs generated from .txt if applicable
scopeSpecificDependency = android.JavaApiLibraryName(ctx.Config(), scopeSpecificDependency)
tag := hiddenAPIStubsDependencyTag{apiScope: apiScope, fromAdditionalDependency: true} tag := hiddenAPIStubsDependencyTag{apiScope: apiScope, fromAdditionalDependency: true}
ctx.AddVariationDependencies(nil, tag, scopeSpecificDependency) ctx.AddVariationDependencies(nil, tag, scopeSpecificDependency)
} }

5
java/sdk_library.go
View File

@@ -1267,7 +1267,10 @@ var implLibraryTag = sdkLibraryComponentTag{name: "impl-library"}
func (module *SdkLibrary) ComponentDepsMutator(ctx android.BottomUpMutatorContext) { func (module *SdkLibrary) ComponentDepsMutator(ctx android.BottomUpMutatorContext) {
for _, apiScope := range module.getGeneratedApiScopes(ctx) { for _, apiScope := range module.getGeneratedApiScopes(ctx) {
// Add dependencies to the stubs library // 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. // 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)) ctx.AddVariationDependencies(nil, apiScope.stubsSourceAndApiTag, module.stubsSourceModuleName(apiScope))