From 6e93ac9a3212089500dee2095d611ff870471e68 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 21 Mar 2019 17:43:49 +0900 Subject: [PATCH] Fix checking of empty slice properties Properties can be empty (not nil), and in that case some weird error messages will happen to be emitted. Bug: N/A Test: try to build with api_pacakges: [] and srcs: [] Change-Id: I492077616e742072696265796520737465616b21 --- java/sdk_library.go | 4 ++-- sysprop/sysprop_library.go | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index 18866d57e..72cce5794 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -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") } diff --git a/sysprop/sysprop_library.go b/sysprop/sysprop_library.go index 6e8e306b4..48078d84e 100644 --- a/sysprop/sysprop_library.go +++ b/sysprop/sysprop_library.go @@ -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") }