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

Merge "Update java_api_library prop name"

Browse Source
This commit is contained in:
Jihoon Kang
2022-11-21 18:03:12 +00:00
committed by Gerrit Code Review
parent 0e2c2aaa60 60d4a09cb5
commit ba36441424
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/java.go
View File

@@ -1552,8 +1552,8 @@ type JavaApiLibraryProperties struct {
// name of the API surface
Api_surface *string
// list of API provider modules that consists this API surface
Api_providers []string
// list of Java API contribution modules that consists this API surface
Api_contributions []string
// List of flags to be passed to the javac compiler to generate jar file
Javacflags []string
@@ -1621,12 +1621,12 @@ func (al *ApiLibrary) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBui
}
}
var javaApiProviderTag = dependencyTag{name: "java-api-provider"}
var javaApiContributionTag = dependencyTag{name: "java-api-contribution"}
func (al *ApiLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
apiProviders := al.properties.Api_providers
for _, apiProviderName := range apiProviders {
ctx.AddDependency(ctx.Module(), javaApiProviderTag, apiProviderName)
apiContributions := al.properties.Api_contributions
for _, apiContributionName := range apiContributions {
ctx.AddDependency(ctx.Module(), javaApiContributionTag, apiContributionName)
}
}
@@ -1645,16 +1645,11 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
homeDir := android.PathForModuleOut(ctx, "metalava", "home")
apiProviders := al.properties.Api_providers
srcFiles := make([]android.Path, len(apiProviders))
for i, apiProviderName := range apiProviders {
apiProvider := ctx.GetDirectDepWithTag(apiProviderName, javaApiProviderTag)
if apiProvider == nil {
panic(fmt.Errorf("Java API provider module %s not found, called from %s", apiProviderName, al.Name()))
}
provider := ctx.OtherModuleProvider(apiProvider, JavaApiImportProvider).(JavaApiImportInfo)
srcFiles[i] = android.PathForModuleSrc(ctx, provider.ApiFile.String())
}
var srcFiles []android.Path
ctx.VisitDirectDepsWithTag(javaApiContributionTag, func(dep android.Module) {
provider := ctx.OtherModuleProvider(dep, JavaApiImportProvider).(JavaApiImportInfo)
srcFiles = append(srcFiles, android.PathForModuleSrc(ctx, provider.ApiFile.String()))
})
cmd := metalavaStubCmd(ctx, rule, srcFiles, homeDir)