tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix checking of empty slice properties" am: 6b200500cc am: 2aad89a882

Browse source 
am: adabb74d08

Change-Id: I2529e13a5310163b22ce41c12e5ab2242c944b4a
This commit is contained in:
Inseob Kim 2019-03-21 19:00:18 -07:00 committed by android-build-merger
commit 2d99aace46
2 changed files with 7 additions and 3 deletions
Show stats 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) {
if module.Library.Module.properties.Srcs == nil {
if len(module.Library.Module.properties.Srcs) == 0 {
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")
}

6
sysprop/sysprop_library.go
View file

@ -82,7 +82,11 @@ func syspropLibraryFactory() android.Module {
}
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")
}