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

Commit cd722aaa authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Move aidl_camera_build_version to build number allowlist" into main am: 80a65416 

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



Change-Id: I29054f64945c95d6fcc6d3a97cedd8210cbf8246
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ed05d5b 80a65416

genrule/allowlists.go

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package genrule 
var (

	SandboxingDenyModuleList = []string{

		// go/keep-sorted start

		"aidl_camera_build_version",

		"com.google.pixel.camera.hal.manifest",

		// go/keep-sorted end

	}

genrule/genrule.go

+18 −4
Original line number Diff line number Diff line
@@ -243,13 +243,27 @@ func toolDepsMutator(ctx android.BottomUpMutatorContext) { 
	}

}



var buildNumberAllowlistKey = android.NewOnceKey("genruleBuildNumberAllowlistKey")



// This allowlist should be kept to the bare minimum, it's

// intended for things that existed before the build number

// was tightly controlled. Prefer using libbuildversion

// via the use_version_lib property of cc modules.

var genrule_build_number_allowlist = map[string]bool{

// This is a function instead of a global map so that

// soong plugins cannot add entries to the allowlist

func isModuleInBuildNumberAllowlist(ctx android.ModuleContext) bool {

	allowlist := ctx.Config().Once(buildNumberAllowlistKey, func() interface{} {

		return map[string]bool{

			// go/keep-sorted start

			"build/soong/tests:gen": true,

			"hardware/google/camera/common/hal/aidl_service:aidl_camera_build_version": true,

			"tools/tradefederation/core:tradefed_zip":                                  true,

			// go/keep-sorted end

		}

	}).(map[string]bool)



	_, ok := allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()]

	return ok

}



// generateCommonBuildActions contains build action generation logic
@@ -547,7 +561,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) { 
		cmd.ImplicitTools(tools)

		cmd.ImplicitPackagedTools(packagedTools)

		if proptools.Bool(g.properties.Uses_order_only_build_number_file) {

			if _, ok := genrule_build_number_allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()]; !ok {

			if !isModuleInBuildNumberAllowlist(ctx) {

				ctx.ModuleErrorf("Only allowlisted modules may use uses_order_only_build_number_file: true")

			}

			cmd.OrderOnly(ctx.Config().BuildNumberFile(ctx))