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

Merge "Modify error emit condition for checking api files in java_api_library"

Browse Source
This commit is contained in:
Jihoon Kang
2023-05-25 21:09:40 +00:00
committed by Gerrit Code Review
parent 0cf043fd48 160634ca3d
commit de68c07ce5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -1813,7 +1813,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
case javaApiContributionTag: case javaApiContributionTag:
provider := ctx.OtherModuleProvider(dep, JavaApiImportProvider).(JavaApiImportInfo) provider := ctx.OtherModuleProvider(dep, JavaApiImportProvider).(JavaApiImportInfo)
providerApiFile := provider.ApiFile providerApiFile := provider.ApiFile
if providerApiFile == nil { if providerApiFile == nil && !ctx.Config().AllowMissingDependencies() {
ctx.ModuleErrorf("Error: %s has an empty api file.", dep.Name()) ctx.ModuleErrorf("Error: %s has an empty api file.", dep.Name())
} }
srcFiles = append(srcFiles, android.PathForSource(ctx, providerApiFile.String())) srcFiles = append(srcFiles, android.PathForSource(ctx, providerApiFile.String()))
@@ -1835,7 +1835,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
srcFiles = append(srcFiles, android.PathForModuleSrc(ctx, api)) srcFiles = append(srcFiles, android.PathForModuleSrc(ctx, api))
} }
if srcFiles == nil { if srcFiles == nil && !ctx.Config().AllowMissingDependencies() {
ctx.ModuleErrorf("Error: %s has an empty api file.", ctx.ModuleName()) ctx.ModuleErrorf("Error: %s has an empty api file.", ctx.ModuleName())
} }