Merge "Change default to require licenses property."
This commit is contained in:
commit
7bb0238418
2 changed files with 2 additions and 2 deletions
|
@ -845,7 +845,7 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod
|
|||
case "*selinux.selinuxContextsModule": // license properties written
|
||||
case "*sysprop.syspropLibrary": // license properties written
|
||||
default:
|
||||
if ctx.Config().IsEnvTrue("ANDROID_REQUIRE_LICENSES") {
|
||||
if !ctx.Config().IsEnvFalse("ANDROID_REQUIRE_LICENSES") {
|
||||
return fmt.Errorf("custom make rules not allowed for %q (%q) module %q", ctx.ModuleType(mod), reflect.TypeOf(mod), ctx.ModuleName(mod))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -253,7 +253,7 @@ func getLicenses(ctx BaseModuleContext, module Module) []string {
|
|||
|
||||
primaryProperty := module.base().primaryLicensesProperty
|
||||
if primaryProperty == nil {
|
||||
if ctx.Config().IsEnvTrue("ANDROID_REQUIRE_LICENSES") {
|
||||
if !ctx.Config().IsEnvFalse("ANDROID_REQUIRE_LICENSES") {
|
||||
ctx.ModuleErrorf("module type %q must have an applicable licenses property", ctx.OtherModuleType(module))
|
||||
}
|
||||
return nil
|
||||
|
|
Loading…
Reference in a new issue