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

Merge "Fix checking of empty slice properties"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-22 01:22:11 +00:00
committed by Gerrit Code Review
parent 53c88448fd 6e93ac9a32
commit 6b200500cc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/sdk_library.go
View File

@@ -668,11 +668,11 @@ func SdkLibraryMutator(mctx android.TopDownMutatorContext) {
} }
func (module *SdkLibrary) createInternalModules(mctx android.TopDownMutatorContext) { func (module *SdkLibrary) createInternalModules(mctx android.TopDownMutatorContext) {
if module.Library.Module.properties.Srcs == nil { if len(module.Library.Module.properties.Srcs) == 0 {
mctx.PropertyErrorf("srcs", "java_sdk_library must specify srcs") mctx.PropertyErrorf("srcs", "java_sdk_library must specify srcs")
} }
if module.sdkLibraryProperties.Api_packages == nil { if len(module.sdkLibraryProperties.Api_packages) == 0 {
mctx.PropertyErrorf("api_packages", "java_sdk_library must specify api_packages") mctx.PropertyErrorf("api_packages", "java_sdk_library must specify api_packages")
} }

6
sysprop/sysprop_library.go
View File

@@ -82,7 +82,11 @@ func syspropLibraryFactory() android.Module {
} }
func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) { func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
if m.syspropLibraryProperties.Api_packages == nil { if len(m.commonProperties.Srcs) == 0 {
ctx.PropertyErrorf("srcs", "sysprop_library must specify srcs")
}
if len(m.syspropLibraryProperties.Api_packages) == 0 {
ctx.PropertyErrorf("api_packages", "sysprop_library must specify api_packages") ctx.PropertyErrorf("api_packages", "sysprop_library must specify api_packages")
} }