Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec01d2d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change default to require licenses property." am: 7bb02384

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818661

Change-Id: Ie6e749f3f9acd03c287b845c4e54a326383240b4
parents 910cf32f 7bb02384
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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))
			}
		}
+1 −1
Original line number Diff line number Diff line
@@ -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