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

Merge "Generate java_api_contribution module from droidstubs module"

Browse Source
This commit is contained in:
Jihoon Kang
2023-01-26 23:54:14 +00:00
committed by Gerrit Code Review
parent 8562855d2a 3198f3cb52
commit b6690d21ae
5 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/java.go
View File

@@ -1594,7 +1594,11 @@ type JavaApiImportInfo struct {
var JavaApiImportProvider = blueprint.NewProvider(JavaApiImportInfo{})
func (ap *JavaApiContribution) GenerateAndroidBuildActions(ctx android.ModuleContext) {
apiFile := android.PathForModuleSrc(ctx, String(ap.properties.Api_file))
var apiFile android.Path = nil
if apiFileString := ap.properties.Api_file; apiFileString != nil {
apiFile = android.PathForModuleSrc(ctx, String(apiFileString))
}
ctx.SetProvider(JavaApiImportProvider, JavaApiImportInfo{
ApiFile: apiFile,
})
@@ -1725,7 +1729,11 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
switch tag {
case javaApiContributionTag:
provider := ctx.OtherModuleProvider(dep, JavaApiImportProvider).(JavaApiImportInfo)
srcFiles = append(srcFiles, android.PathForSource(ctx, provider.ApiFile.String()))
providerApiFile := provider.ApiFile
if providerApiFile == nil {
ctx.ModuleErrorf("Error: %s has an empty api file.", dep.Name())
}
srcFiles = append(srcFiles, android.PathForSource(ctx, providerApiFile.String()))
case libTag:
provider := ctx.OtherModuleProvider(dep, JavaInfoProvider).(JavaInfo)
classPaths = append(classPaths, provider.HeaderJars...)